Merge branch 'brandondoran-express-send'

Author: leebyron

package.json

@@ -92,6 +92,7 @@
     "multer": "1.2.0",
     "raw-body": "2.1.6",
     "sane": "1.4.1",
+    "sinon": "1.17.6",
     "supertest": "1.0.1",
     "supertest-as-promised": "2.0.2"
   },

src/__tests__/http-test.js

@@ -13,6 +13,7 @@
 
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
+import sinon from 'sinon';
 import { stringify } from 'querystring';
 import url from 'url';
 import zlib from 'zlib';
@@ -832,6 +833,42 @@ describe('test harness', () => {
       });
     });
 
+    describe('Response functionality', () => {
+      it('uses send only for express', async () => {
+        const app = server();
+        let spyEnd = {};
+        let spySend = {};
+
+        // mount a middleware to spy on response methods
+        app.use(urlString(), (req, res, next) => {
+          spyEnd = sinon.spy(res, 'end');
+          try {
+            // res.send is undefined with connect
+            spySend = sinon.spy(res, 'send');
+          } catch (err) {
+            spySend = undefined;
+          }
+          next();
+        });
+
+        app.use(urlString(), graphqlHTTP({
+          schema: TestSchema
+        }));
+
+        await request(app)
+          .get(urlString({
+            query: '{test}'
+          }));
+
+        if (name === 'connect') {
+          expect(spyEnd.calledOnce);
+          expect(spySend).to.equal(undefined);
+        } else {
+          expect(spySend.calledOnce);
+        }
+      });
+    });
+
     describe('Pretty printing', () => {
       it('supports pretty printing', async () => {
         const app = server();

src/index.js

@@ -241,12 +241,12 @@ export default function graphqlHTTP(options: Options): Middleware {
           operationName, result
         });
         response.setHeader('Content-Type', 'text/html; charset=utf-8');
-        response.end(data);
+        sendResponse(response, data);
       } else {
         // Otherwise, present JSON directly.
         const data = JSON.stringify(result, null, pretty ? 2 : 0);
         response.setHeader('Content-Type', 'application/json; charset=utf-8');
-        response.end(data);
+        sendResponse(response, data);
       }
     });
   };
@@ -306,3 +306,15 @@ function canDisplayGraphiQL(
   // prefers HTML over JSON.
   return !raw && accepts(request).types([ 'json', 'html' ]) === 'html';
 }
+
+/**
+ * Helper function for sending the response data. Use response.send it method
+ * exists (express), otherwise use response.end (connect).
+ */
+function sendResponse(response: Response, data: string): void {
+  if (typeof response.send === 'function') {
+    response.send(data);
+  } else {
+    response.end(data);
+  }
+}