Skip to content

tests: simplify 'astNode' and 'extensionASTNodes' tests #2302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 21, 2019
Merged

tests: simplify 'astNode' and 'extensionASTNodes' tests #2302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 11 additions & 17 deletions src/utilities/__tests__/buildASTSchema-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { describe, it } from 'mocha';
import dedent from '../../jsutils/dedent';
import invariant from '../../jsutils/invariant';

import { Kind } from '../../language/kinds';
import { parse } from '../../language/parser';
import { print } from '../../language/printer';

Expand Down Expand Up @@ -786,22 +785,17 @@ describe('Schema Builder', () => {
const testScalar = assertScalarType(schema.getType('TestScalar'));
const testDirective = assertDirective(schema.getDirective('test'));

const restoredSchemaAST = {
kind: Kind.DOCUMENT,
definitions: [
schema.astNode,
query.astNode,
testInput.astNode,
testEnum.astNode,
testUnion.astNode,
testInterface.astNode,
testType.astNode,
testScalar.astNode,
testDirective.astNode,
],
loc: undefined,
};
expect(restoredSchemaAST).to.be.deep.equal(ast);
expect([
schema.astNode,
query.astNode,
testInput.astNode,
testEnum.astNode,
testUnion.astNode,
testInterface.astNode,
testType.astNode,
testScalar.astNode,
testDirective.astNode,
]).to.be.deep.equal(ast.definitions);

const testField = query.getFields().testField;
expect(printASTNode(testField)).to.equal(
Expand Down
73 changes: 33 additions & 40 deletions src/utilities/__tests__/extendSchema-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { describe, it } from 'mocha';
import dedent from '../../jsutils/dedent';
import invariant from '../../jsutils/invariant';

import { Kind } from '../../language/kinds';
import { parse } from '../../language/parser';
import { print } from '../../language/printer';

Expand Down Expand Up @@ -101,7 +100,7 @@ const testSchemaDefinitions = testSchemaAST.definitions.map(print);
function printTestSchemaChanges(extendedSchema) {
const ast = parse(printSchema(extendedSchema));
return print({
kind: Kind.DOCUMENT,
...ast,
definitions: ast.definitions.filter(
node => !testSchemaDefinitions.includes(print(node)),
),
Expand Down Expand Up @@ -333,7 +332,7 @@ describe('extendSchema', () => {
});

it('correctly assign AST nodes to new and extended types', () => {
const extendedSchema = extendTestSchema(`
const firstExtensionAST = parse(`
extend type Query {
newField(testArg: TestInput): TestEnum
}
Expand Down Expand Up @@ -362,7 +361,9 @@ describe('extendSchema', () => {
testInputField: TestEnum
}
`);
const ast = parse(`
const extendedSchema = extendSchema(testSchema, firstExtensionAST);

const secondExtensionAST = parse(`
extend type Query {
oneMoreNewField: TestUnion
}
Expand Down Expand Up @@ -395,7 +396,10 @@ describe('extendSchema', () => {

directive @test(arg: Int) repeatable on FIELD | SCALAR
`);
const extendedTwiceSchema = extendSchema(extendedSchema, ast);
const extendedTwiceSchema = extendSchema(
extendedSchema,
secondExtensionAST,
);

const query = assertObjectType(extendedTwiceSchema.getType('Query'));
const someEnum = assertEnumType(extendedTwiceSchema.getType('SomeEnum'));
Expand Down Expand Up @@ -429,41 +433,30 @@ describe('extendSchema', () => {
expect(testInput).to.include({ extensionASTNodes: undefined });
expect(testInterface).to.include({ extensionASTNodes: undefined });

expect(query.extensionASTNodes).to.have.lengthOf(2);
expect(someScalar.extensionASTNodes).to.have.lengthOf(2);
expect(someEnum.extensionASTNodes).to.have.lengthOf(2);
expect(someUnion.extensionASTNodes).to.have.lengthOf(2);
expect(someInput.extensionASTNodes).to.have.lengthOf(2);
expect(someInterface.extensionASTNodes).to.have.lengthOf(2);

invariant(testInput.astNode);
invariant(testEnum.astNode);
invariant(testUnion.astNode);
invariant(testInterface.astNode);
invariant(testType.astNode);
invariant(testDirective.astNode);

const restoredExtensionAST = {
kind: Kind.DOCUMENT,
definitions: [
testInput.astNode,
testEnum.astNode,
testUnion.astNode,
testInterface.astNode,
testType.astNode,
testDirective.astNode,
].concat(
query.extensionASTNodes || [],
someScalar.extensionASTNodes || [],
someEnum.extensionASTNodes || [],
someUnion.extensionASTNodes || [],
someInput.extensionASTNodes || [],
someInterface.extensionASTNodes || [],
),
};
expect(
printSchema(extendSchema(testSchema, restoredExtensionAST)),
).to.be.equal(printSchema(extendedTwiceSchema));
invariant(query.extensionASTNodes);
invariant(someScalar.extensionASTNodes);
invariant(someEnum.extensionASTNodes);
invariant(someUnion.extensionASTNodes);
invariant(someInput.extensionASTNodes);
invariant(someInterface.extensionASTNodes);

expect([
testInput.astNode,
testEnum.astNode,
testUnion.astNode,
testInterface.astNode,
testType.astNode,
testDirective.astNode,
...query.extensionASTNodes,
...someScalar.extensionASTNodes,
...someEnum.extensionASTNodes,
...someUnion.extensionASTNodes,
...someInput.extensionASTNodes,
...someInterface.extensionASTNodes,
]).to.have.members([
...firstExtensionAST.definitions,
...secondExtensionAST.definitions,
]);

const newField = query.getFields().newField;
expect(printASTNode(newField)).to.equal(
Expand Down