You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2020/09/29 11:28:11 UTC
[tinkerpop] branch master updated (5d0fed4 -> a8f7a3b)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from 5d0fed4 Merge branch '3.4-dev'
add 007c45c TINKERPOP-2421 Added requestOption capabilities for javascript
add 9b97d3a TINKERPOP-2421 Refactoring connection/client interaction.
add cdbde2a Merge branch 'TINKERPOP-2421' into 3.4-dev
new a8f7a3b Merge branch '3.4-dev'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../gremlin-javascript/lib/driver/client.js | 42 +++++++------
.../gremlin-javascript/lib/driver/connection.js | 26 ++++----
.../lib/driver/driver-remote-connection.js | 17 +++++-
.../lib/process/graph-traversal.js | 32 ++++++----
.../lib/process/traversal-strategy.js | 70 +++++++---------------
.../lib/structure/io/type-serializers.js | 9 ++-
.../test/integration/traversal-test.js | 14 +++--
.../gremlin-javascript/test/unit/client-test.js | 10 ++--
.../gremlin-javascript/test/unit/traversal-test.js | 49 ++++-----------
9 files changed, 133 insertions(+), 136 deletions(-)
[tinkerpop] 01/01: Merge branch '3.4-dev'
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit a8f7a3be2974b46f902f75cfe67ec5b63d6d9e35
Merge: 5d0fed4 cdbde2a
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Tue Sep 29 07:26:20 2020 -0400
Merge branch '3.4-dev'
.../gremlin-javascript/lib/driver/client.js | 42 +++++++------
.../gremlin-javascript/lib/driver/connection.js | 26 ++++----
.../lib/driver/driver-remote-connection.js | 17 +++++-
.../lib/process/graph-traversal.js | 32 ++++++----
.../lib/process/traversal-strategy.js | 70 +++++++---------------
.../lib/structure/io/type-serializers.js | 9 ++-
.../test/integration/traversal-test.js | 14 +++--
.../gremlin-javascript/test/unit/client-test.js | 10 ++--
.../gremlin-javascript/test/unit/traversal-test.js | 49 ++++-----------
9 files changed, 133 insertions(+), 136 deletions(-)
diff --cc gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/client-test.js
index a86409f,e135047..426f851
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/client-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/client-test.js
@@@ -55,20 -55,4 +55,20 @@@ describe('Client', function ()
customClient._connection = connectionMock;
customClient.submit(query)
});
+
+ it('should allow to submit extra arguments', function () {
+ const connectionMock = {
- submit: function (bytecode, op, args, requestId, processor) {
++ submit: function (processor, op, args, requestId) {
+ assert.strictEqual(args.gremlin, query);
- assert.strictEqual(args.scriptEvaluationTimeout, 123);
++ assert.strictEqual(args.evaluationTimeout, 123);
+ assert.strictEqual(processor, customOpProcessor);
+
+ return Promise.resolve();
+ }
+ };
+
+ const customClient = new Client('ws://localhost:9321', {traversalSource: 'g', processor: customOpProcessor});
+ customClient._connection = connectionMock;
- customClient.submit(query, null, {"scriptEvaluationTimeout": 123})
++ customClient.submit(query, null, {"evaluationTimeout": 123})
+ });
});