Simplify findDeprecatedUsages since "deprecationReason" is always present

Also make tests more readable

Author: IvanGoncharov

src/utilities/__tests__/findDeprecatedUsages-test.js

@@ -11,20 +11,20 @@ import { findDeprecatedUsages } from '../findDeprecatedUsages';
 describe('findDeprecatedUsages', () => {
   const schema = buildSchema(`
     enum EnumType {
-      ONE
-      TWO @deprecated(reason: "Some enum reason.")
+      NORMAL_VALUE
+      DEPRECATED_VALUE @deprecated(reason: "Some enum reason.")
     }
 
     type Query {
-      normalField(enumArg: EnumType): String
+      normalField(enumArg: [EnumType]): String
       deprecatedField: String @deprecated(reason: "Some field reason.")
     }
   `);
 
   it('should report empty set for no deprecated usages', () => {
     const errors = findDeprecatedUsages(
       schema,
-      parse('{ normalField(enumArg: ONE) }'),
+      parse('{ normalField(enumArg: [NORMAL_VALUE]) }'),
     );
 
     expect(errors.length).to.equal(0);
@@ -46,13 +46,17 @@ describe('findDeprecatedUsages', () => {
   it('should report usage of deprecated enums', () => {
     const errors = findDeprecatedUsages(
       schema,
-      parse('{ normalField(enumArg: TWO) }'),
+      parse(`
+        {
+           normalField(enumArg: [NORMAL_VALUE, DEPRECATED_VALUE])
+        }
+      `),
     );
 
     const errorMessages = errors.map(err => err.message);
 
     expect(errorMessages).to.deep.equal([
-      'The enum value "EnumType.TWO" is deprecated. Some enum reason.',
+      'The enum value "EnumType.DEPRECATED_VALUE" is deprecated. Some enum reason.',
     ]);
   });
 });

src/utilities/findDeprecatedUsages.js

@@ -26,35 +26,29 @@ export function findDeprecatedUsages(
     ast,
     visitWithTypeInfo(typeInfo, {
       Field(node) {
+        const parentType = typeInfo.getParentType();
         const fieldDef = typeInfo.getFieldDef();
-        if (fieldDef && fieldDef.isDeprecated) {
-          const parentType = typeInfo.getParentType();
-          if (parentType) {
-            const reason = fieldDef.deprecationReason;
-            errors.push(
-              new GraphQLError(
-                `The field "${parentType.name}.${fieldDef.name}" is deprecated.` +
-                  (reason != null ? ' ' + reason : ''),
-                node,
-              ),
-            );
-          }
+        if (parentType && fieldDef && fieldDef.deprecationReason != null) {
+          errors.push(
+            new GraphQLError(
+              `The field "${parentType.name}.${fieldDef.name}" is deprecated. ` +
+                fieldDef.deprecationReason,
+              node,
+            ),
+          );
         }
       },
       EnumValue(node) {
+        const type = getNamedType(typeInfo.getInputType());
         const enumVal = typeInfo.getEnumValue();
-        if (enumVal && enumVal.isDeprecated) {
-          const type = getNamedType(typeInfo.getInputType());
-          if (type) {
-            const reason = enumVal.deprecationReason;
-            errors.push(
-              new GraphQLError(
-                `The enum value "${type.name}.${enumVal.name}" is deprecated.` +
-                  (reason != null && reason !== '' ? ' ' + reason : ''),
-                node,
-              ),
-            );
-          }
+        if (type && enumVal && enumVal.deprecationReason != null) {
+          errors.push(
+            new GraphQLError(
+              `The enum value "${type.name}.${enumVal.name}" is deprecated. ` +
+                enumVal.deprecationReason,
+              node,
+            ),
+          );
         }
       },
     }),