Revert "Fix query batching for single queries for hapi integration. (a…

…pollographql#123)" This reverts commit 64cd806.
PhiloInc · Sep 6, 2016 · 7b42c33 · 7b42c33
1 parent ce151ab
commit 7b42c33
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,6 @@
 * Support adding parsed operations to the OperationStore. ([@nnance](https://github.com/nnance))
 * Expose ApolloOptions as part of the public API.
 
-### vNEXT
-* Fixed query batching with hapi integration. [PR #123](https://github.com/apollostack/apollo-server/pull/123)
-
 ### v0.2.5
 * Made promise compatible with fibers ([@benjamn](https://github.com/benjamn) in [#92](https://github.com/apollostack/apollo-server/pull/92))
 

diff --git a/src/integrations/hapiApollo.ts b/src/integrations/hapiApollo.ts
@@ -43,9 +43,9 @@ export class ApolloHAPI {
                 return;
               }
 
-              const {isBatch, responses} = await processQuery(request.payload, optionsObject);
+              const responses = await processQuery(request.payload, optionsObject);
 
-              if (isBatch) {
+              if (responses.length > 1) {
                 reply(responses);
               } else {
                 const gqlResponse = responses[0];
@@ -137,7 +137,7 @@ async function processQuery(body, optionsObject) {
       responses.push({ errors: [formatErrorFn(e)] });
     }
   }
-  return {isBatch, responses};
+  return responses;
 }
 
 function isOptionsFunction(arg: ApolloOptions | HAPIOptionsFunction): arg is HAPIOptionsFunction {

diff --git a/src/integrations/integrations.test.ts b/src/integrations/integrations.test.ts
@@ -283,30 +283,6 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => {
           });
       });
 
-       it('can handle batch requests', () => {
-          app = createApp();
-          const expected = [
-              {
-                  data: {
-                      testString: 'it works',
-                  },
-              },
-          ];
-          const req = request(app)
-              .post('/graphql')
-              .send([{
-                  query: `
-                      query test($echo: String){ testArgument(echo: $echo) }
-                      query test2{ testString }`,
-                  variables: { echo: 'world' },
-                  operationName: 'test2',
-              }]);
-          return req.then((res) => {
-              expect(res.status).to.equal(200);
-              return expect(res.body).to.deep.equal(expected);
-          });
-      });
-
       it('can handle a request with a mutation', () => {
           app = createApp();
           const expected = {