Fix 920

CHANGELOG.md

@@ -7,6 +7,7 @@ Expect active development and potentially significant breaking changes in the `0
 ### 0.5.5
 - Add back missing dependency on lodash.isequal that was mistakenly removed in 0.5.4 [#925](https://github.com/apollostack/apollo-client/pull/925)
 - Implement cache redirects with custom resolvers [PR #921](https://github.com/apollostack/apollo-client/pull/921)
+- Fix issue that caused `createBatchingNetworkInterface` unable to specify request headers by `opts` or `applyMiddleware`. [PR #922](https://github.com/apollostack/apollo-client/pull/922) [Issue #920](https://github.com/apollostack/apollo-client/issues/920)
 
 ### 0.5.4
 - Fix a bug that caused apollo-client to catch errors thrown in Observer.next callbacks [PR #910](https://github.com/apollostack/apollo-client/pull/910)

src/transport/batchedNetworkInterface.ts

@@ -117,13 +117,14 @@ export class HTTPBatchedNetworkInterface extends HTTPFetchNetworkInterface {
       return printRequest(request);
     });
 
-    return fetch(this._uri, assign({}, this._opts, options, {
+    return fetch(this._uri, assign({}, this._opts, {
       body: JSON.stringify(printedRequests),
-      headers: assign({}, options.headers, {
+      method: 'POST',
+    }, options, {
+      headers: assign({}, {
         Accept: '*/*',
         'Content-Type': 'application/json',
-      }),
-      method: 'POST',
+      }, options.headers),
     }));
   };
 }

test/batchedNetworkInterface.ts

@@ -57,14 +57,14 @@ describe('HTTPBatchedNetworkInterface', () => {
 
     fetch = fetchFunc || createMockFetch({
       url,
-      opts: merge(opts, {
+      opts: merge({
         body: JSON.stringify(printedRequests),
         headers:  {
           Accept: '*/*',
           'Content-Type': 'application/json',
         },
         method: 'POST',
-      }),
+      }, opts),
       result: createMockedIResponse(resultList),
     });
 
@@ -223,4 +223,19 @@ describe('HTTPBatchedNetworkInterface', () => {
       middlewares: [ changeMiddleware ],
     });
   });
+
+  it('opts should be able to modify request headers and method (#920)', () => {
+    const customHeaders: { [index: string]: string } = {
+      Accept: 'application/json, text/plain, */*',
+      'Content-Type': 'x-www-form-urlencoded',
+    };
+    const options = { method: 'GET', headers: customHeaders };
+    return assertRoundtrip({
+      requestResultPairs: [{
+        request: { query: authorQuery },
+        result: authorResult,
+      }],
+      opts: options,
+    });
+  });
 });

test/mocks/mockFetch.ts

@@ -68,7 +68,7 @@ export class MockFetch {
   public fetchParamsToKey(url: string, opts: RequestInit): string {
     return JSON.stringify({
       url,
-      opts,
+      opts: sortByKey(opts),
     });
   }
 
@@ -80,6 +80,19 @@ export class MockFetch {
   }
 }
 
+function sortByKey(obj: any): Object {
+  return Object.keys(obj).sort().reduce(
+    (ret: any, key: string): Object => (
+      Object.assign({
+        [key]: Object.prototype.toString.call(obj[key]).slice(8, -1) === 'Object'
+          ? sortByKey(obj[key])
+          : obj[key],
+      }, ret)
+    ),
+    {},
+  );
+}
+
 export function createMockFetch(...mockedResponses: MockedFetchResponse[]) {
   return new MockFetch(...mockedResponses).getFetch();
 }