Merge pull request #411 from graingert/update-peerdeps

Update graphql peer dependency to 0.12.x

package.json

@@ -64,7 +64,7 @@
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",
-    "babel-eslint": "7.2.3",
+    "babel-eslint": "^8.2.1",
     "babel-plugin-transform-async-to-generator": "6.24.1",
     "babel-plugin-transform-class-properties": "6.24.1",
     "babel-plugin-transform-flow-strip-types": "6.22.0",
@@ -76,12 +76,12 @@
     "chai": "^4.1.2",
     "connect": "3.6.3",
     "coveralls": "2.13.1",
-    "eslint": "^4.6.0",
-    "eslint-plugin-flowtype": "^2.35.1",
+    "eslint": "^4.15.0",
+    "eslint-plugin-flowtype": "^2.41.0",
     "express": "^4.15.4",
     "express3": "*",
-    "flow-bin": "0.52.0",
-    "graphql": "0.11.2",
+    "flow-bin": "^0.63.1",
+    "graphql": "^0.12.3",
     "isparta": "4.0.0",
     "mocha": "3.5.0",
     "multer": "1.3.0",
@@ -92,6 +92,6 @@
     "supertest": "3.0.0"
   },
   "peerDependencies": {
-    "graphql": "^0.10.0 || ^0.11.0"
+    "graphql": "^0.10.0 || ^0.11.0 || ^0.12.0"
   }
 }

src/__tests__/http-test.js

@@ -1255,9 +1255,7 @@ describe('test harness', () => {
         expect(JSON.parse(response.text)).to.deep.equal({
           errors: [
             {
-              message:
-                'Syntax Error GraphQL request (1:1) ' +
-                'Unexpected Name "syntaxerror"\n\n1: syntaxerror\n   ^\n',
+              message: 'Syntax Error: Unexpected Name "syntaxerror"',
               locations: [{ line: 1, column: 1 }],
             },
           ],