fix bugs in EnumValue

apollographql · Jan 15, 2018 · 2f91223 · 2f91223
1 parent 8c5052d
commit 2f91223
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 4 deletions.
diff --git a/src/rules.js b/src/rules.js
@@ -1,4 +1,4 @@
-import { GraphQLError } from 'graphql';
+import { GraphQLError, getNamedType } from 'graphql';
 
 export function OperationsMustHaveNames(context) {
   return {
@@ -76,12 +76,14 @@ export function noDeprecatedFields(context) {
       }
     },
     EnumValue(node) {
-      const enumVal = context.getEnumValue();
+      // context is of type ValidationContext which doesn't export getEnumValue.
+      // Bypass the public API to grab that information directly from _typeInfo.
+      const enumVal = context._typeInfo.getEnumValue();
       if (enumVal && enumVal.isDeprecated) {
         const type = getNamedType(context.getInputType());
         if (type) {
           const reason = enumVal.deprecationReason;
-          errors.push(new GraphQLError(
+          context.reportError(new GraphQLError(
             `The enum value ${type.name}.${enumVal.name} is deprecated.` +
             (reason ? ' ' + reason : ''),
             [ node ]

diff --git a/test/makeRule.js b/test/makeRule.js
@@ -928,7 +928,19 @@ const noDeprecatedFieldsCases = {
         }
       })
       class HelloApp extends React.Component {}
+    `,
     `
+      @relay({
+        fragments: {
+          greetings: () => Relay.QL\`
+            fragment on Greetings {
+              image(size: LARGE) { size }
+            }
+          \`,
+        }
+      })
+      class HelloApp extends React.Component {}
+    `,
   ],
   fail: [
     {
@@ -952,7 +964,29 @@ const noDeprecatedFieldsCases = {
         line: 6,
         column: 17
       }]
-    }
+    },
+    {
+      options,
+      parser: 'babel-eslint',
+      code: `
+        @relay({
+          fragments: {
+            greetings: () => Relay.QL\`
+              fragment on Greetings {
+                image(size: SMALL) { size }
+              }
+            \`,
+          }
+        })
+        class HelloApp extends React.Component {}
+      `,
+      errors: [{
+        message: "The enum value ImageSize.SMALL is deprecated. Use 'LARGE' instead",
+        type: 'TaggedTemplateExpression',
+        line: 6,
+        column: 29
+      }]
+    },
   ]
 };
 

diff --git a/test/schema.graphql b/test/schema.graphql
@@ -46,6 +46,16 @@ type Greetings {
   id: ID
   hello: String
   hi: String @deprecated(reason: "Please use the more formal greeting 'hello'")
+  image(size: ImageSize!): Image
+}
+
+type Image {
+  size: ImageSize!
+}
+
+enum ImageSize {
+  SMALL @deprecated(reason: "Use 'LARGE' instead")
+  LARGE
 }
 
 type Story {