Fixed testing environment.

Author: c1moore

bower.json

@@ -35,7 +35,8 @@
   "devDependencies": {
     "sinon": "~1.10.3",
     "angular-mocks": ">=1.2.23",
-    "angular-resource": ">=1.2.23"
+    "angular-resource": ">=1.2.23",
+    "angular-route":  ">=1.2.23"
   },
   "dependencies": {
     "angular": ">= 1.2.23"

package.json

@@ -45,6 +45,7 @@
     "karma-phantomjs-launcher": "^0.1.4",
     "karma-sinon": "^1.0.3",
     "mocha": "^1.20.1",
+    "phantomjs-polyfill": "0.*",
     "sinon": "^1.10.2"
   },
   "ignore": [

src/services/adapters/npmBatchRequestAdapter.js

@@ -23,8 +23,6 @@
   function transformGETRequest(requestIndex, request, httpConfig) {
     var paramSerializer;
 
-    httpConfig.data = httpConfig.data || {};
-
     httpConfig.data[requestIndex] = {
       method:   request.method,
       uri:      request.url,
@@ -41,8 +39,6 @@
    * @param httpConfig (Object) - the Angular $http config Object for the batched request
    */
   function transformRequestWithBody(requestIndex, request, httpConfig) {
-    httpConfig.data = httpConfig.data || {};
-
     httpConfig.data[requestIndex] = {
       method:   request.method,
       uri:      request.url,
@@ -69,7 +65,8 @@
     var httpConfig = {
       method:   'POST',
       url:      config.batchEndpointUrl,
-      headers:  config.batchRequestHeaders || {}
+      headers:  config.batchRequestHeaders || {},
+      data:     {}
     };
 
     for(requestIndex = 0; requestIndex < requests.length; requestIndex++) {
@@ -84,6 +81,8 @@
 
       transformRequest(requestIndex, requests[requestIndex], httpConfig);
     }
+
+    return httpConfig;
   };
 
   /**
@@ -102,7 +101,7 @@
     var batchResponses = [];
     var response;
 
-    for(requestIndex = requests.length - 1; requestIndex >= 0; requestIndex--) {
+    for(requestIndex = 0; requestIndex < requests.length; requestIndex++) {
       response = rawResponse.data[requestIndex];
 
       batchResponses.push(new HttpBatchResponseData(

tests/karma.conf.shared.js

@@ -73,10 +73,9 @@ shared.files = [
     'src/angular-http-batch.js',
     'src/providers/httpBatchConfig.js',
     'src/services/httpBatcher.js',
-    'src/services/adapters/httpBatchResponseData.js',
-    'src/services/adapters/httpAdapter.js',
-    'src/services/adapters/nodeJsMultiFetchAdapter.js',
-    'src/config/httpBackendDecorator.js'
+    'src/services/adapters/*.js',
+    'src/config/httpBackendDecorator.js',
+    './node_modules/phantomjs-polyfill/bind-polyfill.js'
 ];
 
 module.exports = shared;

tests/services/adapters/npmBatchRequestAdapter.spec.js

@@ -2,6 +2,8 @@
   'use strict';
 
   describe('npmBatchRequestAdapter', function() {
+    beforeEach(module(window.ahb.name));
+
     beforeEach(inject(function($injector) {
       this.adapter = $injector.get('npmBatchRequestAdapter');
       this.sandbox = sinon.sandbox.create();
@@ -39,13 +41,18 @@
           for(requestIndex = 0; requestIndex < requests.length; requestIndex++) {
             requestData = batchRequest.data[requestIndex];
 
-            expect(requestData).to.have.all.keys('method', 'uri', 'headers');
+            expect(requestData).to.include.keys('method', 'uri');
             expect(requestData.method).to.equal(requests[requestIndex].method);
             expect(requestData.uri).to.equal(requests[requestIndex].url);
-            expect(requestData.headers).to.deep.equal(requests[requestIndex].headers);
+
+            if(requestData.headers) {
+              expect(requestData).to.include.keys('headers');
+
+              expect(requestData.headers).to.deep.equal(requests[requestIndex].headers);
+            };
 
             if(requestData.method !== 'GET') {
-              expect(requestData).to.have.all.keys('body');
+              expect(requestData).to.include.keys('body');
 
               expect(requestData.body).to.deep.equal(requests[requestIndex].data);
             }
@@ -194,7 +201,7 @@
 
       it('should parse multiple responses and multiplex them appropriately', function() {
         var requests;
-        var responses;
+        var response;
         var parsedResponses;
 
         requests = [{
@@ -208,7 +215,7 @@
           }
         }];
 
-        responses = {
+        response = {
           data: {
             0:    {
               statusCode: 200,
@@ -231,12 +238,12 @@
           }
         };
 
-        parsedResponses = this.adapter.parseResponse([request], response);
+        parsedResponses = this.adapter.parseResponse(requests, response);
 
         expect(parsedResponses).to.be.an('array').with.lengthOf(2);
 
-        this.testResponse(request, response.data[0], parsedResponses[0]);
-        this.testResponse(request, response.data[1], parsedResponses[1]);
+        this.testResponse(requests[0], response.data[0], parsedResponses[0]);
+        this.testResponse(requests[1], response.data[1], parsedResponses[1]);
       });
     });
   });