From 825f04dac27ee9acb1e93f0b0f6a6639216acbe9 Mon Sep 17 00:00:00 2001
From: greenkeeperio-bot <support@greenkeeper.io>
Date: Tue, 24 Jan 2017 12:42:21 -0800
Subject: [PATCH 1/5] chore(package): update graphql to version 0.9.0

https://greenkeeper.io/
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 95bea087641..66ecabcf362 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "uuid": "^3.0.1"
   },
   "peerDependencies": {
-    "graphql": "^0.5.0 || ^0.6.0 || ^0.7.0 || ^0.8.0"
+    "graphql": "^0.9.0"
   },
   "optionalDependencies": {
     "@types/graphql": "^0.8.5"

From c969f49894ddf03aa6a8b609e37af131e59a3239 Mon Sep 17 00:00:00 2001
From: Jonas Helfer <helfer@users.noreply.github.com>
Date: Tue, 24 Jan 2017 15:23:35 -0800
Subject: [PATCH 2/5] Update graphql-js dependency

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 66ecabcf362..58e8615a8d1 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "uuid": "^3.0.1"
   },
   "peerDependencies": {
-    "graphql": "^0.9.0"
+    "graphql": "^0.5.0 || ^0.6.0 || ^0.7.0 || ^0.8.0 || ^0.9.0", 
   },
   "optionalDependencies": {
     "@types/graphql": "^0.8.5"
@@ -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",

From 17997eec44c8e7ba686b9fcdb61a9b206bbb8a4c Mon Sep 17 00:00:00 2001
From: Jonas Helfer <helfer@users.noreply.github.com>
Date: Tue, 24 Jan 2017 15:31:27 -0800
Subject: [PATCH 3/5] Fix typo

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 58e8615a8d1..ff9edfd1711 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "uuid": "^3.0.1"
   },
   "peerDependencies": {
-    "graphql": "^0.5.0 || ^0.6.0 || ^0.7.0 || ^0.8.0 || ^0.9.0", 
+    "graphql": "^0.5.0 || ^0.6.0 || ^0.7.0 || ^0.8.0 || ^0.9.0"
   },
   "optionalDependencies": {
     "@types/graphql": "^0.8.5"

From e596ff57075e483e498b3c005f7e6f147c40d0f4 Mon Sep 17 00:00:00 2001
From: Jonas Helfer <jonas@helfer.email>
Date: Tue, 24 Jan 2017 15:52:32 -0800
Subject: [PATCH 4/5] remove obsolete test

---
 src/test/testSchemaGenerator.ts | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/src/test/testSchemaGenerator.ts b/src/test/testSchemaGenerator.ts
index 968bed119ee..eb64694033b 100644
--- a/src/test/testSchemaGenerator.ts
+++ b/src/test/testSchemaGenerator.ts
@@ -832,27 +832,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{

From 7b7f2904dc661054007c6ba2d11b206eecf776dc Mon Sep 17 00:00:00 2001
From: Jonas Helfer <jonas@helfer.email>
Date: Tue, 24 Jan 2017 15:55:40 -0800
Subject: [PATCH 5/5] fix linter errors

---
 src/test/testSchemaGenerator.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/test/testSchemaGenerator.ts b/src/test/testSchemaGenerator.ts
index eb64694033b..ca01619047a 100644
--- a/src/test/testSchemaGenerator.ts
+++ b/src/test/testSchemaGenerator.ts
@@ -4,9 +4,6 @@
 import { assert, expect } from 'chai';
 import {
   graphql,
-  GraphQLInt,
-  GraphQLObjectType,
-  GraphQLSchema,
   GraphQLResolveInfo,
   GraphQLScalarType,
   Kind,
@@ -22,7 +19,6 @@ import {
   addErrorLoggingToSchema,
   addSchemaLevelResolveFunction,
   attachConnectorsToContext,
-  assertResolveFunctionsPresent,
   chainResolvers,
   concatenateTypeDefs,
 } from '../schemaGenerator';