2
0
mirror of https://github.com/tenrok/axios.git synced 2026-06-20 20:00:40 +03:00

Merging master

This commit is contained in:
mzabriskie
2014-12-10 23:53:05 -07:00
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -27,7 +27,7 @@ module.exports = function xhrAdapter(resolve, reject, config) {
// Create the request // Create the request
var request = new(XMLHttpRequest || ActiveXObject)('Microsoft.XMLHTTP'); var request = new(XMLHttpRequest || ActiveXObject)('Microsoft.XMLHTTP');
request.open(config.method, buildUrl(config.url, config.params), true); request.open(config.method.toUpperCase(), buildUrl(config.url, config.params), true);
// Listen for ready state // Listen for ready state
request.onreadystatechange = function () { request.onreadystatechange = function () {
+1 -1
View File
@@ -63,7 +63,7 @@ describe('interceptors', function () {
responseText: 'OK' responseText: 'OK'
}); });
expect(request.method).toBe('post'); expect(request.method).toBe('POST');
expect(request.url).toBe('/bar'); expect(request.url).toBe('/bar');
}); });
}); });
+1 -1
View File
@@ -21,7 +21,7 @@ describe('options', function () {
}, 'waiting for the request', 100); }, 'waiting for the request', 100);
runs(function () { runs(function () {
expect(request.method).toBe('get'); expect(request.method).toBe('GET');
}); });
}); });