Skip to content

Commit

Permalink
Merge pull request #264 from apollostack/greenkeeper-graphql-0.9.0
Browse files Browse the repository at this point in the history
Update graphql to version 0.9.0 馃殌
  • Loading branch information
helfer committed Jan 25, 2017
2 parents 5d9172b + 7b7f290 commit 6dbc89a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 27 deletions.
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -52,7 +52,7 @@
"uuid": "^3.0.1"
},
"peerDependencies": {
"graphql": "^0.5.0 || ^0.6.0 || ^0.7.0 || ^0.8.0"
"graphql": "^0.5.0 || ^0.6.0 || ^0.7.0 || ^0.8.0 || ^0.9.0"
},
"optionalDependencies": {
"@types/graphql": "^0.8.5"
Expand All @@ -69,7 +69,7 @@
"body-parser": "^1.15.0",
"chai": "^3.5.0",
"express": "^4.13.4",
"graphql": "^0.8.1",
"graphql": "^0.9.0",
"graphql-subscriptions": "^0.2.0",
"graphql-type-json": "^0.1.3",
"istanbul": "^0.4.5",
Expand Down
25 changes: 0 additions & 25 deletions src/test/testSchemaGenerator.ts
Expand Up @@ -4,9 +4,6 @@
import { assert, expect } from 'chai';
import {
graphql,
GraphQLInt,
GraphQLObjectType,
GraphQLSchema,
GraphQLResolveInfo,
GraphQLScalarType,
Kind,
Expand All @@ -22,7 +19,6 @@ import {
addErrorLoggingToSchema,
addSchemaLevelResolveFunction,
attachConnectorsToContext,
assertResolveFunctionsPresent,
chainResolvers,
concatenateTypeDefs,
} from '../schemaGenerator';
Expand Down Expand Up @@ -832,27 +828,6 @@ describe('generating schema from shorthand', () => {
assert.doesNotThrow(makeExecutableSchema.bind(null, { typeDefs: short, resolvers: rf }), SchemaError);
});

it('throws an error if field.resolve is not a function', () => {
const schema = new GraphQLSchema({
query: new GraphQLObjectType(<any> {
name: 'Query',
fields: {
aField: {
type: GraphQLInt,
args: { a: { type: GraphQLInt } },
resolve: 'NOT A FUNCTION',
},
},
}),
});

const resolverValidationOptions: IResolverValidationOptions = {
requireResolversForArgs: true,
};

expect(() => assertResolveFunctionsPresent(schema, resolverValidationOptions)).to.throw('Resolver "Query.aField" must be a function');
});

it('throws an error if a resolver is not a function', () => {
const short = `
type Query{
Expand Down

0 comments on commit 6dbc89a

Please sign in to comment.