This is an automated email from the ASF dual-hosted git repository.
jorgebg pushed a commit to branch 3.4-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 0dd374a399360281577eb04b4112af72f7d06f1b
Merge: 7ea3dfa e2c4b27
Author: Jorge Bay Gondra <jorgebaygon...@gmail.com>
AuthorDate: Wed Jan 29 16:30:31 2020 +0100
Merge branch '3.3-dev' into 3.4-dev
.../gremlin-javascript/lib/structure/graph.js | 34 ++++++---
.../lib/structure/io/type-serializers.js | 4 +-
.../test/cucumber/feature-steps.js | 4 +-
.../test/unit/structure-types-test.js | 87 ++++++++++++++++++++++
4 files changed, 115 insertions(+), 14 deletions(-)
diff --cc
gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/graph.js
index edbc02c,5019a9c..359e2f8
---
a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/graph.js
+++
b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/graph.js
@@@ -165,11 -168,20 +168,20 @@@ function areEqual(obj1, obj2)
return false;
}
+ function summarize(value) {
+ if (value === null || value === undefined) {
+ return value;
+ }
+
+ const strValue = value.toString();
+ return strValue.length > 20 ? strValue.substr(0, 20) : strValue;
+ }
+
module.exports = {
- Edge: Edge,
- Graph: Graph,
- Path: Path,
- Property: Property,
- Vertex: Vertex,
- VertexProperty: VertexProperty
+ Edge,
+ Graph,
+ Path,
+ Property,
+ Vertex,
+ VertexProperty
-};
+};
diff --cc
gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
index fed551d,2ad085f..4c0414a
---
a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
+++
b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
@@@ -34,7 -34,6 +34,7 @@@ const traversal = require('../../lib/pr
const Path = graphModule.Path;
const __ = graphTraversalModule.statics;
const t = traversalModule.t;
- const direction = traversalModule.direction
++const direction = traversalModule.direction;
// Determines whether the feature maps (m[]), are deserialized as objects
(true) or maps (false).
// Use false for GraphSON3.
@@@ -65,7 -63,6 +65,9 @@@ const ignoreReason =
const ignoredScenarios = {
// An associative array containing the scenario name as key, for example:
'g_withSideEffectXa_setX_V_both_name_storeXaX_capXaX': new
IgnoreError(ignoreReason.setNotSupported),
+ 'g_withSideEffectXa_setX_V_both_name_aggregateXlocal_aX_capXaX': new
IgnoreError(ignoreReason.setNotSupported),
++ 'g_V_shortestPath_edgesIncluded': new
IgnoreError(ignoreReason.needsFurtherInvestigation),
++ 'g_V_shortestPath_edgesIncluded_edgesXoutEX': new
IgnoreError(ignoreReason.needsFurtherInvestigation)
};
defineSupportCode(function(methods) {
