Merge pull request #371 from michaeldgraham/master

Fixing augmentation testing with related issues #369 & #370
neo4j-graphql · Jan 5, 2020 · dff73a9 · dff73a9
2 parents 0297649 + ff9a341
commit dff73a9
Show file tree

Hide file tree

Showing 4 changed files with 312 additions and 16 deletions.
diff --git a/src/augment/input-values.js b/src/augment/input-values.js
@@ -83,7 +83,7 @@ export const augmentInputTypePropertyFields = ({
         );
       }
     }
-    if (orderingType) {
+    if (orderingType && outputType !== SpatialType.POINT) {
       orderingType.values.push(...buildPropertyOrderingValues({ fieldName }));
     }
   }

diff --git a/src/augment/types/relationship/mutation.js b/src/augment/types/relationship/mutation.js
@@ -180,6 +180,7 @@ const buildRelationshipMutationAPI = ({
   generatedTypeMap = buildRelationshipMutationOutputType({
     mutationAction,
     mutationOutputType,
+    propertyInputValues,
     propertyOutputFields,
     relationshipName,
     fromType,
@@ -380,6 +381,7 @@ const buildRelationshipMutationDirectives = ({
 const buildRelationshipMutationOutputType = ({
   mutationAction,
   mutationOutputType,
+  propertyInputValues,
   propertyOutputFields,
   relationshipName,
   fromType,
@@ -390,7 +392,8 @@ const buildRelationshipMutationOutputType = ({
     mutationAction === RelationshipMutation.CREATE ||
     mutationAction === RelationshipMutation.DELETE ||
     mutationAction === RelationshipMutation.MERGE ||
-    mutationAction === RelationshipMutation.UPDATE
+    (mutationAction === RelationshipMutation.UPDATE &&
+      propertyInputValues.length)
   ) {
     const relationTypeDirective = buildRelationDirective({
       relationshipName,

diff --git a/test/integration/integration.test.js b/test/integration/integration.test.js
@@ -724,7 +724,7 @@ test('query relationship property data', async t => {
     });
 });
 
-test('query using inine fragment', async t => {
+test('query using inline fragment', async t => {
   t.plan(1);
 
   let expected = {
-Original file line number
+Diff line change
@@ Expand Up / @@ -83,7 +83,7 @@ export const augmentInputTypePropertyFields = ({ @@
             );
           }
         }
-        if (orderingType) {
+        if (orderingType && outputType !== SpatialType.POINT) {
           orderingType.values.push(...buildPropertyOrderingValues({ fieldName }));
         }
       }
@@ Expand Down @@