[test] Make green

facebook · Jun 26, 2019 · 1415b7d · 1415b7d
1 parent 13a24ac
commit 1415b7d
Show file tree

Hide file tree

Showing 14 changed files with 130 additions and 128 deletions.
diff --git a/packages/relay-compiler/codegen/__tests__/__snapshots__/RelayCodeGenerator-test.js.snap b/packages/relay-compiler/codegen/__tests__/__snapshots__/RelayCodeGenerator-test.js.snap
@@ -12,7 +12,7 @@ query TestQuery($date: String) {
 ERROR:
 NormalizationCodeGenerator: Complex argument values (Lists or InputObjects with nested variables) are not supported.
 
-Source: GraphQL request (2:17)
+Source: GraphQL request:2:17
 1: query TestQuery($date: String) {
 2:   items(filter: {date: $date}) {
                    ^

diff --git a/packages/relay-compiler/codegen/__tests__/__snapshots__/compileRelayArtifacts-test.js.snap b/packages/relay-compiler/codegen/__tests__/__snapshots__/compileRelayArtifacts-test.js.snap
@@ -3286,7 +3286,7 @@ Error: Encountered 2 error(s):
 - Operation 'FeedbackQuery' references undefined variable(s):
   - $commentsKey: String.
   
-  Source (derived): GraphQL request (25:26)
+  Source (derived): GraphQL request:25:26
   24:     key: "FeedbackFragment_comments"
   25:     dynamicKey_UNSTABLE: $commentsKey
                                ^
@@ -3295,7 +3295,7 @@ Error: Encountered 2 error(s):
 - Operation 'PaginationQuery' references undefined variable(s):
   - $commentsKey: String.
   
-  Source (derived): GraphQL request (25:26)
+  Source (derived): GraphQL request:25:26
   24:     key: "FeedbackFragment_comments"
   25:     dynamicKey_UNSTABLE: $commentsKey
                                ^
@@ -4151,31 +4151,31 @@ THROWN EXCEPTION:
 
 Error: Found a circular reference from fragment 'Profile'.
 
-Source (derived): GraphQL request (2:1)
+Source (derived): GraphQL request:2:1
 1: # expected-to-throw
 2: fragment RefetchableFragment on Query @refetchable(queryName: "RefetchableFragmentQuery") @argumentDefinitions(id: {type: "ID!"}) {
    ^
 3:   node(id: $id) {
 
-Source (derived): GraphQL request (2:1)
+Source (derived): GraphQL request:2:1
 1: # expected-to-throw
 2: fragment RefetchableFragment on Query @refetchable(queryName: "RefetchableFragmentQuery") @argumentDefinitions(id: {type: "ID!"}) {
    ^
 3:   node(id: $id) {
 
-Source: GraphQL request (7:7)
+Source: GraphQL request:7:7
 6:       name
 7:       ...Profile @arguments(includeProfile: true)
          ^
 8:     }
 
-Source: GraphQL request (21:9)
+Source: GraphQL request:21:9
 20:       node {
 21:         ...Profile
             ^
 22:       }
 
-Source: GraphQL request (21:9)
+Source: GraphQL request:21:9
 20:       node {
 21:         ...Profile
             ^
@@ -4927,13 +4927,13 @@ THROWN EXCEPTION:
 Error: Encountered 1 error(s):
 - Unexpected directive: @defer. This directive can only be used on fields/fragments that are fetched from the server schema, but it is used inside a client-only selection.
   
-  Source (derived): GraphQL request (12:23)
+  Source (derived): GraphQL request:12:23
   11:   emailAddresses
   12:   ...DeferredFragment @defer(label: "DeferredFragmentLabel")
                             ^
   13: }
   
-  Source (derived): GraphQL request (12:3)
+  Source (derived): GraphQL request:12:3
   11:   emailAddresses
   12:   ...DeferredFragment @defer(label: "DeferredFragmentLabel")
         ^
@@ -5334,13 +5334,13 @@ THROWN EXCEPTION:
 Error: Encountered 1 error(s):
 - Cannot use @relay(mask: false) on fragment spreads for fragments with directives.
   
-  Source: GraphQL request (5:5)
+  Source: GraphQL request:5:5
   4:   me {
   5:     ...Profile @relay(mask: false)
          ^
   6:   }
   
-  Source: GraphQL request (9:26)
+  Source: GraphQL request:9:26
    8: 
    9: fragment Profile on User @inline {
                                ^
@@ -5734,7 +5734,7 @@ THROWN EXCEPTION:
 Error: Encountered 1 error(s):
 - Variables are not yet supported inside @inline fragments.
   
-  Source: GraphQL request (10:24)
+  Source: GraphQL request:10:24
    9: fragment Profile on User @inline {
   10:   profilePicture(size: $pictureSize) {
                              ^
@@ -5772,7 +5772,7 @@ THROWN EXCEPTION:
 Error: Encountered 1 error(s):
 - Variables are not yet supported inside @inline fragments.
   
-  Source: GraphQL request (17:24)
+  Source: GraphQL request:17:24
   16:   @inline
   17:   @argumentDefinitions(sizeArg: { type: "[Int]", defaultValue: [50] }) {
                              ^
@@ -6581,13 +6581,13 @@ THROWN EXCEPTION:
 Error: Encountered 1 error(s):
 - Found conflicting @module selections: use a unique alias on the parent fields.
   
-  Source: GraphQL request (22:7)
+  Source: GraphQL request:22:7
   21:     ...MarkdownUserNameRenderer_name
   22:       @module(name: "BarMarkdownUserNameRenderer.react")
             ^
   23:   }
   
-  Source: GraphQL request (13:7)
+  Source: GraphQL request:13:7
   12:     ...MarkdownUserNameRenderer_name
   13:       @module(name: "FooMarkdownUserNameRenderer.react")
             ^
@@ -6783,13 +6783,13 @@ THROWN EXCEPTION:
 Error: Encountered 1 error(s):
 - Required argument 'capitalize: Boolean!' is missing on 'nameWithArgs' in 'TestQuery'.
   
-  Source: GraphQL request (5:7)
+  Source: GraphQL request:5:7
   4:     hometown{
   5:       nameWithArgs
            ^
   6:     }
   
-  Source: GraphQL request (2:1)
+  Source: GraphQL request:2:1
   1: # expected-to-throw
   2: query TestQuery {
      ^
@@ -7472,13 +7472,13 @@ THROWN EXCEPTION:
 Error: Encountered 1 error(s):
 - Found conflicting @module selections: use a unique alias on the parent fields.
   
-  Source: GraphQL request (25:7)
+  Source: GraphQL request:25:7
   24:     ...MarkdownUserNameRenderer_name
   25:       @module(name: "BarMarkdownUserNameRenderer.react")
             ^
   26:   }
   
-  Source: GraphQL request (13:7)
+  Source: GraphQL request:13:7
   12:     ...MarkdownUserNameRenderer_name
   13:       @module(name: "FooMarkdownUserNameRenderer.react")
             ^
@@ -12997,13 +12997,13 @@ THROWN EXCEPTION:
 Error: Encountered 1 error(s):
 - RelayMaskTransform: Cannot use @relay(mask: false) on fragment spread because the fragment definition uses @argumentDefinitions.
   
-  Source: GraphQL request (5:5)
+  Source: GraphQL request:5:5
   4:   me {
   5:     ...User_user @relay(mask: false)
          ^
   6:   }
   
-  Source: GraphQL request (10:24)
+  Source: GraphQL request:10:24
    9: fragment User_user on User
   10:   @argumentDefinitions(isRelative: {type: "Boolean!", defaultValue: false}) {
                              ^
@@ -13423,13 +13423,13 @@ THROWN EXCEPTION:
 Error: RelayParser: Encountered 1 error(s):
 - Variable @arguments values are only supported when the argument is defined with @argumentDefinitions. Check the definition of fragment 'ProfilePhoto'.
   
-  GraphQL request (16:36)
+  GraphQL request:16:36
   15:   __typename
   16:   ...ProfilePhoto @arguments(size: $size)
                                          ^
   17: }
   
-  GraphQL request (19:1)
+  GraphQL request:19:1
   18: 
   19: fragment ProfilePhoto on User {
       ^

diff --git a/packages/relay-compiler/core/__tests__/RelayFindGraphQLTags-test.js b/packages/relay-compiler/core/__tests__/RelayFindGraphQLTags-test.js
@@ -15,7 +15,9 @@ const RelayFindGraphQLTags = require('../RelayFindGraphQLTags');
 
 describe('RelayFindGraphQLTags', () => {
   function find(text, absPath: string = '/path/to/FindGraphQLTags.js') {
-    return RelayFindGraphQLTags.find(FindGraphQLTags.find, text, absPath);
+    return RelayFindGraphQLTags.find(FindGraphQLTags.find, text, absPath).map(
+      tag => tag.template,
+    );
   }
 
   describe('query parsing', () => {