Merging master

test/specs/xsrf.spec.js

@@ -1,3 +1,5 @@
+var cookies = require('../../lib/helpers/cookies');
+
 describe('xsrf', function () {
   beforeEach(function () {
     jasmine.Ajax.install();
@@ -28,6 +30,32 @@ describe('xsrf', function () {
     });
   });
 
+  it('should not set xsrf header if xsrfCookieName is null', function (done) {
+    document.cookie = axios.defaults.xsrfCookieName + '=12345';
+
+    axios('/foo', {
+      xsrfCookieName: null
+    });
+
+    getAjaxRequest().then(function (request) {
+      expect(request.requestHeaders[axios.defaults.xsrfHeaderName]).toEqual(undefined);
+      done();
+    });
+  });
+
+  it('should not read cookies at all if xsrfCookieName is null', function (done) {
+    spyOn(cookies, "read");
+
+    axios('/foo', {
+      xsrfCookieName: null
+    });
+
+    getAjaxRequest().then(function (request) {
+      expect(cookies.read).not.toHaveBeenCalled();
+      done();
+    });
+  });
+
   it('should not set xsrf header for cross origin', function (done) {
     document.cookie = axios.defaults.xsrfCookieName + '=12345';
 

test/unit/adapters/http.js

@@ -168,7 +168,8 @@ module.exports = {
       res.end(req.headers.authorization);
     }).listen(4444, function () {
       var user = 'foo';
-      axios.get('http://' + user + '@localhost:4444/').then(function (res) {
+      var headers = { Authorization: 'Bearer 1234' };
+      axios.get('http://' + user + '@localhost:4444/', { headers: headers }).then(function (res) {
         var base64 = new Buffer(user + ':', 'utf8').toString('base64');
         test.equal(res.data, 'Basic ' + base64);
         test.done();
@@ -176,6 +177,20 @@ module.exports = {
     });
   },
 
+  testBasicAuthWithHeader: function (test) {
+    server = http.createServer(function (req, res) {
+      res.end(req.headers.authorization);
+    }).listen(4444, function () {
+      var auth = { username: 'foo', password: 'bar' };
+      var headers = { Authorization: 'Bearer 1234' };
+      axios.get('http://localhost:4444/', { auth: auth, headers: headers }).then(function (res) {
+        var base64 = new Buffer('foo:bar', 'utf8').toString('base64');
+        test.equal(res.data, 'Basic ' + base64);
+        test.done();
+      });
+    });
+  },
+
   testMaxContentLength: function(test) {
     var str = Array(100000).join('ж');