Skip to content

Enable Flow on validation tests + Refactoring #1618

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.

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 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
54 changes: 24 additions & 30 deletions src/validation/__tests__/ExecutableDefinitions-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,20 @@
*/

import { describe, it } from 'mocha';
import { expectPassesRule, expectFailsRule } from './harness';
import { expectValidationErrors } from './harness';
import {
ExecutableDefinitions,
nonExecutableDefinitionMessage,
} from '../rules/ExecutableDefinitions';

function expectErrors(queryStr) {
return expectValidationErrors(ExecutableDefinitions, queryStr);
}

function expectValid(queryStr) {
expectErrors(queryStr).to.deep.equal([]);
}

function nonExecutableDefinition(defName, line, column) {
return {
message: nonExecutableDefinitionMessage(defName),
Expand All @@ -23,22 +31,17 @@ function nonExecutableDefinition(defName, line, column) {

describe('Validate: Executable definitions', () => {
it('with only operation', () => {
expectPassesRule(
ExecutableDefinitions,
`
expectValid(`
query Foo {
dog {
name
}
}
`,
);
`);
});

it('with operation and fragment', () => {
expectPassesRule(
ExecutableDefinitions,
`
expectValid(`
query Foo {
dog {
name
Expand All @@ -49,14 +52,11 @@ describe('Validate: Executable definitions', () => {
fragment Frag on Dog {
name
}
`,
);
`);
});

it('with type definition', () => {
expectFailsRule(
ExecutableDefinitions,
`
expectErrors(`
query Foo {
dog {
name
Expand All @@ -70,18 +70,14 @@ describe('Validate: Executable definitions', () => {
extend type Dog {
color: String
}
`,
[
nonExecutableDefinition('Cow', 8, 7),
nonExecutableDefinition('Dog', 12, 7),
],
);
`).to.deep.equal([
nonExecutableDefinition('Cow', 8, 7),
nonExecutableDefinition('Dog', 12, 7),
]);
});

it('with schema definition', () => {
expectFailsRule(
ExecutableDefinitions,
`
expectErrors(`
schema {
query: Query
}
Expand All @@ -91,12 +87,10 @@ describe('Validate: Executable definitions', () => {
}

extend schema @directive
`,
[
nonExecutableDefinition('schema', 2, 7),
nonExecutableDefinition('Query', 6, 7),
nonExecutableDefinition('schema', 10, 7),
],
);
`).to.deep.equal([
nonExecutableDefinition('schema', 2, 7),
nonExecutableDefinition('Query', 6, 7),
nonExecutableDefinition('schema', 10, 7),
]);
});
});
Loading