update tests to account for new directive

Author: robrichard

src/__tests__/starWarsDeferredQuery-test.js

@@ -25,12 +25,12 @@ describe('Star Wars Query Deferred Tests', () => {
       `;
       const result = await graphql(StarWarsSchema, query);
       expect(result).to.deep.equal({
-        data: {
-          hero: {
-            id: '2001',
-            name: 'R2-D2',
+        errors: [
+          {
+            message: 'Unknown directive "@defer".',
+            locations: [{ line: 5, column: 29 }],
           },
-        },
+        ],
       });
     });
   });
@@ -125,7 +125,7 @@ describe('Star Wars Query Deferred Tests', () => {
         label: 'DeferNested',
         path: ['hero'],
         data: {
-          appearsIn: ['NEWHOPE', 'EMPIRE', 'JEDI'],
+          appearsIn: ['NEW_HOPE', 'EMPIRE', 'JEDI'],
           primaryFunction: 'Astromech',
         },
       });

src/type/__tests__/introspection-test.js

@@ -865,34 +865,6 @@ describe('Introspection', () => {
                 },
               ],
             },
-            {
-              name: 'defer',
-              locations: ['FRAGMENT_SPREAD', 'INLINE_FRAGMENT'],
-              args: [
-                {
-                  defaultValue: null,
-                  name: 'if',
-                  type: {
-                    kind: 'SCALAR',
-                    name: 'Boolean',
-                    ofType: null,
-                  },
-                },
-                {
-                  defaultValue: null,
-                  name: 'label',
-                  type: {
-                    kind: 'NON_NULL',
-                    name: null,
-                    ofType: {
-                      kind: 'SCALAR',
-                      name: 'String',
-                      ofType: null,
-                    },
-                  },
-                },
-              ],
-            },
             {
               name: 'deprecated',
               isRepeatable: false,

src/type/directives.js

@@ -20,7 +20,7 @@ import {
   type DirectiveLocationEnum,
 } from '../language/directiveLocation';
 
-import { GraphQLString, GraphQLBoolean } from './scalars';
+import { GraphQLString, GraphQLBoolean, GraphQLInt } from './scalars';
 import {
   type GraphQLFieldConfigArgumentMap,
   type GraphQLArgument,
@@ -212,6 +212,7 @@ export const GraphQLStreamDirective = new GraphQLDirective({
       type: GraphQLNonNull(GraphQLString),
       description: 'Unique name',
     },
+    // eslint-disable-next-line camelcase
     initial_count: {
       type: GraphQLNonNull(GraphQLInt),
       description: 'Number of items to return immediately',

src/utilities/__tests__/buildASTSchema-test.js

@@ -15,7 +15,6 @@ import {
   assertDirective,
   GraphQLSkipDirective,
   GraphQLIncludeDirective,
-  GraphQLDeferDirective,
   GraphQLDeprecatedDirective,
 } from '../../type/directives';
 import {
@@ -209,13 +208,12 @@ describe('Schema Builder', () => {
     expect(cycleSDL(sdl, { commentDescriptions: true })).to.equal(sdl);
   });
 
-  it('Maintains @skip, @include & @defer', () => {
+  it('Maintains @skip & @include', () => {
     const schema = buildSchema('type Query');
 
-    expect(schema.getDirectives()).to.have.lengthOf(4);
+    expect(schema.getDirectives()).to.have.lengthOf(3);
     expect(schema.getDirective('skip')).to.equal(GraphQLSkipDirective);
     expect(schema.getDirective('include')).to.equal(GraphQLIncludeDirective);
-    expect(schema.getDirective('defer')).to.equal(GraphQLDeferDirective);
     expect(schema.getDirective('deprecated')).to.equal(
       GraphQLDeprecatedDirective,
     );
@@ -225,30 +223,27 @@ describe('Schema Builder', () => {
     const schema = buildSchema(`
       directive @skip on FIELD
       directive @include on FIELD
-      directive @defer on FIELD
       directive @deprecated on FIELD_DEFINITION
     `);
 
-    expect(schema.getDirectives()).to.have.lengthOf(4);
+    expect(schema.getDirectives()).to.have.lengthOf(3);
     expect(schema.getDirective('skip')).to.not.equal(GraphQLSkipDirective);
     expect(schema.getDirective('include')).to.not.equal(
       GraphQLIncludeDirective,
     );
-    expect(schema.getDirective('defer')).to.not.equal(GraphQLDeferDirective);
     expect(schema.getDirective('deprecated')).to.not.equal(
       GraphQLDeprecatedDirective,
     );
   });
 
-  it('Adding directives maintains @skip, @include & @defer', () => {
+  it('Adding directives maintains @skip & @include', () => {
     const schema = buildSchema(`
       directive @foo(arg: Int) on FIELD
     `);
 
-    expect(schema.getDirectives()).to.have.lengthOf(5);
+    expect(schema.getDirectives()).to.have.lengthOf(4);
     expect(schema.getDirective('skip')).to.not.equal(undefined);
     expect(schema.getDirective('include')).to.not.equal(undefined);
-    expect(schema.getDirective('defer')).to.not.equal(undefined);
     expect(schema.getDirective('deprecated')).to.not.equal(undefined);
   });
 

src/utilities/__tests__/schemaPrinter-test.js

@@ -614,17 +614,6 @@ describe('Type System Printer', () => {
         if: Boolean!
       ) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
 
-      """
-      Directs the executor to defer this fragment when the \`if\` argument is true or undefined.
-      """
-      directive @defer(
-        """Deferred when true or undefined."""
-        if: Boolean
-
-        """Unique name"""
-        label: String!
-      ) on FRAGMENT_SPREAD | INLINE_FRAGMENT
-
       """Marks an element of a GraphQL schema as no longer supported."""
       directive @deprecated(
         """
@@ -932,14 +921,6 @@ describe('Type System Printer', () => {
         isDeprecated: Boolean!
         deprecationReason: String
       }
-      # Directs the executor to defer this fragment when the \`if\` argument is true or undefined.
-      directive @defer(
-        # Deferred when true or undefined.
-        if: Boolean
-
-        # Unique name
-        label: String!
-      ) on FRAGMENT_SPREAD | INLINE_FRAGMENT
 
       # Marks an element of a GraphQL schema as no longer supported.
       directive @deprecated(

src/utilities/buildASTSchema.js

@@ -107,11 +107,19 @@ export function buildASTSchema(
     directives.push(GraphQLIncludeDirective);
   }
 
-  if (!directives.some(directive => directive.name === 'defer')) {
+  if (
+    options &&
+    options.experimentalDeferFragmentSpreads &&
+    !directives.some(directive => directive.name === 'defer')
+  ) {
     directives.push(GraphQLDeferDirective);
   }
 
-  if (!directives.some(directive => directive.name === 'stream')) {
+  if (
+    options &&
+    options.experimentalStream &&
+    !directives.some(directive => directive.name === 'stream')
+  ) {
     directives.push(GraphQLStreamDirective);
   }