Fixing issue #7

dist/axios.amd.js

@@ -83,7 +83,7 @@ define("axios", ["undefined"], function(__WEBPACK_EXTERNAL_MODULE_2__) { return
 	  // Provide alias for success
 	  promise.success = function success(fn) {
 	    promise.then(function(response) {
-	      fn(response);
+	      fn(response.data, response.status, response.headers, response.config);
 	    });
 	    return promise;
 	  };
@@ -91,7 +91,7 @@ define("axios", ["undefined"], function(__WEBPACK_EXTERNAL_MODULE_2__) { return
 	  // Provide alias for error
 	  promise.error = function error(fn) {
 	    promise.then(null, function(response) {
-	      fn(response);
+	      fn(response.data, response.status, response.headers, response.config);
 	    });
 	    return promise;
 	  };
@@ -437,12 +437,7 @@ define("axios", ["undefined"], function(__WEBPACK_EXTERNAL_MODULE_2__) { return
 	      // Resolve or reject the Promise based on the status
 	      (request.status >= 200 && request.status < 300
 	        ? resolve
-	        : reject)(
-	          response.data,
-	          response.status,
-	          response.headers,
-	          response.config
-	        );
+	        : reject)(response);
 	
 	      // Clean up request
 	      request = null;

dist/axios.js

@@ -84,7 +84,7 @@ var axios =
 	  // Provide alias for success
 	  promise.success = function success(fn) {
 	    promise.then(function(response) {
-	      fn(response);
+	      fn(response.data, response.status, response.headers, response.config);
 	    });
 	    return promise;
 	  };
@@ -92,7 +92,7 @@ var axios =
 	  // Provide alias for error
 	  promise.error = function error(fn) {
 	    promise.then(null, function(response) {
-	      fn(response);
+	      fn(response.data, response.status, response.headers, response.config);
 	    });
 	    return promise;
 	  };
@@ -438,12 +438,7 @@ var axios =
 	      // Resolve or reject the Promise based on the status
 	      (request.status >= 200 && request.status < 300
 	        ? resolve
-	        : reject)(
-	          response.data,
-	          response.status,
-	          response.headers,
-	          response.config
-	        );
+	        : reject)(response);
 	
 	      // Clean up request
 	      request = null;

karma.conf.js

@@ -16,7 +16,7 @@ module.exports = function(config) {
     // list of files / patterns to load in the browser
     files: [
       'dist/axios.js',
-      'test/specs/axios.spec.js'
+      'test/specs/**/*.spec.js'
     ],
 
 

lib/adapters/http.js

@@ -52,12 +52,7 @@ module.exports = function httpAdapter(resolve, reject, config) {
       // Resolve or reject the Promise based on the status
       (res.statusCode >= 200 && res.statusCode < 300
         ? resolve
-        : reject)(
-          response.data,
-          response.status,
-          response.headers,
-          response.config
-        );
+        : reject)(response);
     });
   });
 

lib/adapters/xhr.js

@@ -44,12 +44,7 @@ module.exports = function xhrAdapter(resolve, reject, config) {
       // Resolve or reject the Promise based on the status
       (request.status >= 200 && request.status < 300
         ? resolve
-        : reject)(
-          response.data,
-          response.status,
-          response.headers,
-          response.config
-        );
+        : reject)(response);
 
       // Clean up request
       request = null;

lib/axios.js

@@ -31,7 +31,7 @@ var axios = module.exports = function axios(config) {
   // Provide alias for success
   promise.success = function success(fn) {
     promise.then(function(response) {
-      fn(response);
+      fn(response.data, response.status, response.headers, response.config);
     });
     return promise;
   };
@@ -39,7 +39,7 @@ var axios = module.exports = function axios(config) {
   // Provide alias for error
   promise.error = function error(fn) {
     promise.then(null, function(response) {
-      fn(response);
+      fn(response.data, response.status, response.headers, response.config);
     });
     return promise;
   };

package.json

@@ -31,7 +31,7 @@
     "grunt": "^0.4.5",
     "grunt-contrib-clean": "^0.6.0",
     "grunt-contrib-watch": "^0.6.1",
-    "webpack": "^1.3.3-beta2",
+    "webpack": "^1.4.0-beta9",
     "webpack-dev-server": "^1.4.10",
     "grunt-webpack": "^1.0.8",
     "load-grunt-tasks": "^0.6.0",

test/specs/api.spec.js

@@ -0,0 +1,29 @@
+describe('api', function () {
+  it('should have request method helpers', function () {
+    expect(typeof axios.get).toEqual('function');
+    expect(typeof axios.head).toEqual('function');
+    expect(typeof axios.delete).toEqual('function');
+    expect(typeof axios.post).toEqual('function');
+    expect(typeof axios.put).toEqual('function');
+    expect(typeof axios.patch).toEqual('function');
+  });
+
+  it('should have promise method helpers', function () {
+    var promise = axios();
+
+    expect(typeof promise.then).toEqual('function');
+    expect(typeof promise.catch).toEqual('function');
+    expect(typeof promise.success).toEqual('function');
+    expect(typeof promise.error).toEqual('function');
+  });
+
+  it('should have defaults', function () {
+    expect(typeof axios.defaults).toEqual('object');
+    expect(typeof axios.defaults.headers).toEqual('object');
+  });
+
+  it('should have all/spread helpers', function () {
+    expect(typeof axios.all).toEqual('function');
+    expect(typeof axios.spread).toEqual('function');
+  });
+});

test/specs/axios.spec.js

@@ -1,166 +0,0 @@
-describe('axios', function () {
-  describe('api', function () {
-    it('should have request method helpers', function () {
-      expect(typeof axios.get).toEqual('function');
-      expect(typeof axios.head).toEqual('function');
-      expect(typeof axios.delete).toEqual('function');
-      expect(typeof axios.post).toEqual('function');
-      expect(typeof axios.put).toEqual('function');
-      expect(typeof axios.patch).toEqual('function');
-    });
-
-    it('should have promise method helpers', function () {
-      var promise = axios();
-
-      expect(typeof promise.then).toEqual('function');
-      expect(typeof promise.catch).toEqual('function');
-      expect(typeof promise.success).toEqual('function');
-      expect(typeof promise.error).toEqual('function');
-    });
-
-    it('should have defaults', function () {
-      expect(typeof axios.defaults).toEqual('object');
-      expect(typeof axios.defaults.headers).toEqual('object');
-    });
-
-    it('should have all/spread helpers', function () {
-      expect(typeof axios.all).toEqual('function');
-      expect(typeof axios.spread).toEqual('function');
-    });
-  });
-
-  describe('wrapper', function () {
-    beforeEach(function () {
-      jasmine.Ajax.install();
-    });
-
-    it('should make an http request', function () {
-      axios({
-        url: '/foo'
-      });
-
-      var request = jasmine.Ajax.requests.mostRecent();
-      expect(request.url).toBe('/foo');
-    });
-
-    it('should default common headers', function () {
-      axios({
-        url: '/foo'
-      });
-
-      var request = jasmine.Ajax.requests.mostRecent();
-      var headers = axios.defaults.headers.common;
-      for (var key in headers) {
-        if (headers.hasOwnProperty(key)) {
-          expect(request.requestHeaders[key]).toEqual(headers[key]);
-        }
-      }
-    });
-
-    it('should add extra headers for post', function () {
-      axios({
-        method: 'post',
-        url: '/foo',
-        data: {
-          firstName: 'foo',
-          lastName: 'bar'
-        }
-      });
-
-      var request = jasmine.Ajax.requests.mostRecent();
-      var headers = axios.defaults.headers.post;
-      for (var key in headers) {
-        if (headers.hasOwnProperty(key)) {
-          expect(request.requestHeaders[key]).toEqual(headers[key]);
-        }
-      }
-    });
-
-    it('should remove content-type if data is empty', function () {
-      axios({
-        method: 'post',
-        url: '/foo'
-      });
-
-      var request = jasmine.Ajax.requests.mostRecent();
-      expect(request.requestHeaders['content-type']).toEqual(undefined);
-    });
-  });
-
-  describe('options', function () {
-    beforeEach(function () {
-      jasmine.Ajax.install();
-    });
-
-    it('should default method to get', function () {
-      axios({
-        url: '/foo'
-      });
-
-      var request = jasmine.Ajax.requests.mostRecent();
-      expect(request.method).toBe('get');
-    });
-
-    it('should accept headers', function () {
-      axios({
-        url: '/foo',
-        headers: {
-          'X-Requested-With': 'XMLHttpRequest'
-        }
-      });
-
-      var request = jasmine.Ajax.requests.mostRecent();
-      expect(request.requestHeaders['X-Requested-With']).toEqual('XMLHttpRequest');
-    });
-
-    it('should accept params', function () {
-      axios({
-        url: '/foo',
-        params: {
-          foo: 123,
-          bar: 456
-        }
-      });
-
-      var request = jasmine.Ajax.requests.mostRecent();
-      expect(request.url).toBe('/foo?foo=123&bar=456');
-    });
-
-    it('should allow overriding default headers', function () {
-      axios({
-        url: '/foo',
-        headers: {
-          'Accept': 'foo/bar'
-        }
-      });
-
-      var request = jasmine.Ajax.requests.mostRecent();
-      expect(request.requestHeaders['Accept']).toEqual('foo/bar');
-    });
-  });
-
-  describe('xsrf', function () {
-    afterEach(function () {
-      document.cookie = axios.defaults.xsrfCookieName + '=;expires=' + new Date(Date.now() - 86400000).toGMTString();
-    });
-
-    it('should not set xsrf header if cookie is null', function () {
-      axios({
-        url: '/foo'
-      });
-
-      var request = jasmine.Ajax.requests.mostRecent();
-      expect(request.requestHeaders[axios.defaults.xsrfHeaderName]).toEqual(undefined);
-    });
-
-    it('should set xsrf header if cookie is set', function () {
-      document.cookie = axios.defaults.xsrfCookieName + '=12345';
-      axios({
-        url: '/foo'
-      });
-
-      var request = jasmine.Ajax.requests.mostRecent();
-      expect(request.requestHeaders[axios.defaults.xsrfHeaderName]).toEqual('12345');
-    });
-  });
-});

test/specs/options.spec.js

@@ -0,0 +1,51 @@
+describe('options', function () {
+  beforeEach(function () {
+    jasmine.Ajax.install();
+  });
+
+  it('should default method to get', function () {
+    axios({
+      url: '/foo'
+    });
+
+    var request = jasmine.Ajax.requests.mostRecent();
+    expect(request.method).toBe('get');
+  });
+
+  it('should accept headers', function () {
+    axios({
+      url: '/foo',
+      headers: {
+        'X-Requested-With': 'XMLHttpRequest'
+      }
+    });
+
+    var request = jasmine.Ajax.requests.mostRecent();
+    expect(request.requestHeaders['X-Requested-With']).toEqual('XMLHttpRequest');
+  });
+
+  it('should accept params', function () {
+    axios({
+      url: '/foo',
+      params: {
+        foo: 123,
+        bar: 456
+      }
+    });
+
+    var request = jasmine.Ajax.requests.mostRecent();
+    expect(request.url).toBe('/foo?foo=123&bar=456');
+  });
+
+  it('should allow overriding default headers', function () {
+    axios({
+      url: '/foo',
+      headers: {
+        'Accept': 'foo/bar'
+      }
+    });
+
+    var request = jasmine.Ajax.requests.mostRecent();
+    expect(request.requestHeaders['Accept']).toEqual('foo/bar');
+  });
+});

test/specs/promise.spec.js

@@ -0,0 +1,70 @@
+describe('promise', function () {
+  beforeEach(function () {
+    jasmine.Ajax.install();
+  });
+
+  it('should provide succinct object to then', function () {
+    var response;
+    var fulfilled = false;
+
+    axios({
+      url: '/foo'
+    }).then(function (r) {
+        response = r;
+        fulfilled = true;
+      });
+
+    var request = jasmine.Ajax.requests.mostRecent();
+    request.response({
+      status: 200,
+      responseText: '{"hello":"world"}'
+    });
+
+    waitsFor(function () {
+      return fulfilled;
+    });
+
+    runs(function () {
+      expect(typeof response).toEqual('object');
+      expect(response.data.hello).toEqual('world');
+      expect(response.status).toEqual(200);
+      expect(response.headers['content-type']).toEqual('application/json');
+      expect(response.config.url).toEqual('/foo');
+    });
+  });
+
+  it('should provide verbose arguments to success', function () {
+    var data;
+    var status;
+    var headers;
+    var config;
+    var fulfilled = false;
+
+    axios({
+      url: '/foo'
+    }).success(function (d, s, h, c) {
+        data = d;
+        status = s;
+        headers = h;
+        config = c;
+        fulfilled = true;
+      });
+
+    var request = jasmine.Ajax.requests.mostRecent();
+    request.response({
+      status: 200,
+      responseText: '{"hello":"world"}'
+    });
+
+    waitsFor(function () {
+      return fulfilled;
+    });
+
+    runs(function () {
+      expect(data.hello).toEqual('world');
+      expect(status).toBe(200);
+      expect(headers['content-type']).toEqual('application/json');
+      expect(config.url).toEqual('/foo');
+    });
+  });
+});

test/specs/wrapper.spec.js

@@ -0,0 +1,57 @@
+describe('wrapper', function () {
+  beforeEach(function () {
+    jasmine.Ajax.install();
+  });
+
+  it('should make an http request', function () {
+    axios({
+      url: '/foo'
+    });
+
+    var request = jasmine.Ajax.requests.mostRecent();
+    expect(request.url).toBe('/foo');
+  });
+
+  it('should default common headers', function () {
+    axios({
+      url: '/foo'
+    });
+
+    var request = jasmine.Ajax.requests.mostRecent();
+    var headers = axios.defaults.headers.common;
+    for (var key in headers) {
+      if (headers.hasOwnProperty(key)) {
+        expect(request.requestHeaders[key]).toEqual(headers[key]);
+      }
+    }
+  });
+
+  it('should add extra headers for post', function () {
+    axios({
+      method: 'post',
+      url: '/foo',
+      data: {
+        firstName: 'foo',
+        lastName: 'bar'
+      }
+    });
+
+    var request = jasmine.Ajax.requests.mostRecent();
+    var headers = axios.defaults.headers.post;
+    for (var key in headers) {
+      if (headers.hasOwnProperty(key)) {
+        expect(request.requestHeaders[key]).toEqual(headers[key]);
+      }
+    }
+  });
+
+  it('should remove content-type if data is empty', function () {
+    axios({
+      method: 'post',
+      url: '/foo'
+    });
+
+    var request = jasmine.Ajax.requests.mostRecent();
+    expect(request.requestHeaders['content-type']).toEqual(undefined);
+  });
+});

test/specs/xsrf.spec.js

@@ -0,0 +1,24 @@
+describe('xsrf', function () {
+  afterEach(function () {
+    document.cookie = axios.defaults.xsrfCookieName + '=;expires=' + new Date(Date.now() - 86400000).toGMTString();
+  });
+
+  it('should not set xsrf header if cookie is null', function () {
+    axios({
+      url: '/foo'
+    });
+
+    var request = jasmine.Ajax.requests.mostRecent();
+    expect(request.requestHeaders[axios.defaults.xsrfHeaderName]).toEqual(undefined);
+  });
+
+  it('should set xsrf header if cookie is set', function () {
+    document.cookie = axios.defaults.xsrfCookieName + '=12345';
+    axios({
+      url: '/foo'
+    });
+
+    var request = jasmine.Ajax.requests.mostRecent();
+    expect(request.requestHeaders[axios.defaults.xsrfHeaderName]).toEqual('12345');
+  });
+});