Merge pull request #2 from mzabriskie/master

Update upstream

ECOSYSTEM.md

@@ -12,3 +12,4 @@ This is a list of axios related libraries and resources. If you have a suggestio
 * [@3846masa/axios-cookiejar-support](https://github.com/3846masa/axios-cookiejar-support) - Add tough-cookie support to axios
 * [axios-debug-log](https://github.com/Gerhut/axios-debug-log) - Axios interceptor of logging requests & responses by debug.
 * [axios-method-override](https://github.com/jacobbuck/axios-method-override) - Axios http request method override plugin
+* [mocha-axios](https://github.com/jdrydn/mocha-axios) - Streamlined integration testing with Mocha & Axios

README.md

@@ -215,7 +215,8 @@ These are the available config options for making requests. Only the `url` is re
   // This is only applicable for request methods 'PUT', 'POST', and 'PATCH'
   // The last function in the array must return a string or an instance of Buffer, ArrayBuffer,
   // FormData or Stream
-  transformRequest: [function (data) {
+  // You may modify the headers object.
+  transformRequest: [function (data, headers) {
     // Do whatever you want to transform the data
 
     return data;
@@ -557,7 +558,7 @@ params.append('param2', 'value2');
 axios.post('/foo', params);
 ```
 
-> Note that `URLSearchParams` is not supported by all browsers, but there is a [polyfill](https://github.com/WebReflection/url-search-params) available (make sure to polyfill the global environment).
+> Note that `URLSearchParams` is not supported by all browsers (see [caniuse.com](http://www.caniuse.com/#feat=urlsearchparams)), but there is a [polyfill](https://github.com/WebReflection/url-search-params) available (make sure to polyfill the global environment).
 
 Alternatively, you can encode data using the [`qs`](https://github.com/ljharb/qs) library:
 

index.d.ts

@@ -55,6 +55,7 @@ export interface AxiosResponse {
 export interface AxiosError extends Error {
   config: AxiosRequestConfig;
   code?: string;
+  request?: any;
   response?: AxiosResponse;
 }
 

lib/core/Axios.js

@@ -4,8 +4,6 @@ var defaults = require('./../defaults');
 var utils = require('./../utils');
 var InterceptorManager = require('./InterceptorManager');
 var dispatchRequest = require('./dispatchRequest');
-var isAbsoluteURL = require('./../helpers/isAbsoluteURL');
-var combineURLs = require('./../helpers/combineURLs');
 
 /**
  * Create a new instance of Axios
@@ -37,11 +35,6 @@ Axios.prototype.request = function request(config) {
   config = utils.merge(defaults, this.defaults, { method: 'get' }, config);
   config.method = config.method.toLowerCase();
 
-  // Support baseURL config
-  if (config.baseURL && !isAbsoluteURL(config.url)) {
-    config.url = combineURLs(config.baseURL, config.url);
-  }
-
   // Hook up interceptors middleware
   var chain = [dispatchRequest, undefined];
   var promise = Promise.resolve(config);

lib/core/dispatchRequest.js

@@ -4,6 +4,8 @@ var utils = require('./../utils');
 var transformData = require('./transformData');
 var isCancel = require('../cancel/isCancel');
 var defaults = require('../defaults');
+var isAbsoluteURL = require('./../helpers/isAbsoluteURL');
+var combineURLs = require('./../helpers/combineURLs');
 
 /**
  * Throws a `Cancel` if cancellation has been requested.
@@ -23,6 +25,11 @@ function throwIfCancellationRequested(config) {
 module.exports = function dispatchRequest(config) {
   throwIfCancellationRequested(config);
 
+  // Support baseURL config
+  if (config.baseURL && !isAbsoluteURL(config.url)) {
+    config.url = combineURLs(config.baseURL, config.url);
+  }
+
   // Ensure headers exist
   config.headers = config.headers || {};
 

lib/helpers/parseHeaders.js

@@ -2,6 +2,15 @@
 
 var utils = require('./../utils');
 
+// Headers whose duplicates are ignored by node
+// c.f. https://nodejs.org/api/http.html#http_message_headers
+var ignoreDuplicateOf = [
+  'age', 'authorization', 'content-length', 'content-type', 'etag',
+  'expires', 'from', 'host', 'if-modified-since', 'if-unmodified-since',
+  'last-modified', 'location', 'max-forwards', 'proxy-authorization',
+  'referer', 'retry-after', 'user-agent'
+];
+
 /**
  * Parse headers into an object
  *
@@ -29,7 +38,14 @@ module.exports = function parseHeaders(headers) {
     val = utils.trim(line.substr(i + 1));
 
     if (key) {
-      parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;
+      if (parsed[key] && ignoreDuplicateOf.indexOf(key) >= 0) {
+        return;
+      }
+      if (key === 'set-cookie') {
+        parsed[key] = (parsed[key] ? parsed[key] : []).concat([val]);
+      } else {
+        parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;
+      }
     }
   });
 

test/specs/helpers/parseHeaders.spec.js

@@ -15,5 +15,31 @@ describe('helpers::parseHeaders', function () {
     expect(parsed['connection']).toEqual('keep-alive');
     expect(parsed['transfer-encoding']).toEqual('chunked');
   });
-});
 
+  it('should use array for set-cookie', function() {
+    var parsedZero = parseHeaders('');
+    var parsedSingle = parseHeaders(
+      'Set-Cookie: key=val;'
+    );
+    var parsedMulti = parseHeaders(
+      'Set-Cookie: key=val;\n' +
+      'Set-Cookie: key2=val2;\n'
+    );
+
+    expect(parsedZero['set-cookie']).toBeUndefined();
+    expect(parsedSingle['set-cookie']).toEqual(['key=val;']);
+    expect(parsedMulti['set-cookie']).toEqual(['key=val;', 'key2=val2;']);
+  });
+
+  it('should handle duplicates', function() {
+    var parsed = parseHeaders(
+      'Age: age-a\n' + // age is in ignore duplicates blacklist
+      'Age: age-b\n' +
+      'Foo: foo-a\n' +
+      'Foo: foo-b\n'
+    );
+
+    expect(parsed['age']).toEqual('age-a');
+    expect(parsed['foo']).toEqual('foo-a, foo-b');
+  });
+});

test/specs/interceptors.spec.js

@@ -252,4 +252,22 @@ describe('interceptors', function () {
       done();
     });
   });
+
+  it('should modify base URL in request interceptor', function (done) {
+    var instance = axios.create({
+      baseURL: 'http://test.com/'
+    });
+
+    instance.interceptors.request.use(function (config) {
+      config.baseURL = 'http://rebase.com/';
+      return config;
+    });
+
+    instance.get('/foo');
+
+    getAjaxRequest().then(function (request) {
+      expect(request.url).toBe('http://rebase.com/foo');
+      done();
+    });
+  });
 });