mirror of
https://github.com/tenrok/axios.git
synced 2026-06-08 17:22:34 +03:00
Release/v0.22.0 (#4107)
* fix/Avoid package.json import; (#4041) * Added auto-generated config module `env/data.js` for importing package environment vars without importing the whole `package.json`; Refactored `http.js` to use `env/data.js` instead of package.json; * Added `env/data.js`; Added `env/README.md`; * Feat/export package version constant (#4065) * Added auto-generated config module `env/data.js` for importing package environment vars without importing the whole `package.json`; Refactored `http.js` to use `env/data.js` instead of package.json; * Added `env/data.js`; Added `env/README.md`; * Export package version constant; * Fixed cancelToken leakage; Added AbortController support; (#3305) * Fixed cancelToken leakage; Added AbortController support; * Fixed typings; * Documented `signal` option; * Added processing of early cancellation using AbortController without sending a request; Co-authored-by: Jay <jasonsaayman@gmail.com> * Updating CI to run on release branches * Fixed default transitional config for custom Axios instance; (#4052) Refactored `/core/mergeConfig`; Co-authored-by: Jay <jasonsaayman@gmail.com> * Prepping v0.22.0 for release * Updated date Co-authored-by: Dmitriy Mozgovoy <robotshara@gmail.com>
This commit is contained in:
+40
-11
@@ -1,5 +1,8 @@
|
||||
var Cancel = axios.Cancel;
|
||||
var CancelToken = axios.CancelToken;
|
||||
var _AbortController = require('abortcontroller-polyfill/dist/cjs-ponyfill.js').AbortController;
|
||||
|
||||
var AbortController = typeof AbortController === 'function' ? AbortController : _AbortController;
|
||||
|
||||
describe('cancel', function() {
|
||||
beforeEach(function() {
|
||||
@@ -11,12 +14,12 @@ describe('cancel', function() {
|
||||
});
|
||||
|
||||
describe('when called before sending request', function() {
|
||||
it('rejects Promise with a Cancel object', function (done) {
|
||||
it('rejects Promise with a Cancel object', function(done) {
|
||||
var source = CancelToken.source();
|
||||
source.cancel('Operation has been canceled.');
|
||||
axios.get('/foo', {
|
||||
cancelToken: source.token
|
||||
}).catch(function (thrown) {
|
||||
}).catch(function(thrown) {
|
||||
expect(thrown).toEqual(jasmine.any(Cancel));
|
||||
expect(thrown.message).toBe('Operation has been canceled.');
|
||||
done();
|
||||
@@ -25,17 +28,17 @@ describe('cancel', function() {
|
||||
});
|
||||
|
||||
describe('when called after request has been sent', function() {
|
||||
it('rejects Promise with a Cancel object', function (done) {
|
||||
it('rejects Promise with a Cancel object', function(done) {
|
||||
var source = CancelToken.source();
|
||||
axios.get('/foo/bar', {
|
||||
cancelToken: source.token
|
||||
}).catch(function (thrown) {
|
||||
}).catch(function(thrown) {
|
||||
expect(thrown).toEqual(jasmine.any(Cancel));
|
||||
expect(thrown.message).toBe('Operation has been canceled.');
|
||||
done();
|
||||
});
|
||||
|
||||
getAjaxRequest().then(function (request) {
|
||||
getAjaxRequest().then(function(request) {
|
||||
// call cancel() when the request has been sent, but a response has not been received
|
||||
source.cancel('Operation has been canceled.');
|
||||
request.respondWith({
|
||||
@@ -45,7 +48,7 @@ describe('cancel', function() {
|
||||
});
|
||||
});
|
||||
|
||||
it('calls abort on request object', function (done) {
|
||||
it('calls abort on request object', function(done) {
|
||||
var source = CancelToken.source();
|
||||
var request;
|
||||
axios.get('/foo/bar', {
|
||||
@@ -56,7 +59,7 @@ describe('cancel', function() {
|
||||
done();
|
||||
});
|
||||
|
||||
getAjaxRequest().then(function (req) {
|
||||
getAjaxRequest().then(function(req) {
|
||||
// call cancel() when the request has been sent, but a response has not been received
|
||||
source.cancel();
|
||||
request = req;
|
||||
@@ -66,19 +69,19 @@ describe('cancel', function() {
|
||||
|
||||
describe('when called after response has been received', function() {
|
||||
// https://github.com/axios/axios/issues/482
|
||||
it('does not cause unhandled rejection', function (done) {
|
||||
it('does not cause unhandled rejection', function(done) {
|
||||
var source = CancelToken.source();
|
||||
axios.get('/foo', {
|
||||
cancelToken: source.token
|
||||
}).then(function () {
|
||||
window.addEventListener('unhandledrejection', function () {
|
||||
}).then(function() {
|
||||
window.addEventListener('unhandledrejection', function() {
|
||||
done.fail('Unhandled rejection.');
|
||||
});
|
||||
source.cancel();
|
||||
setTimeout(done, 100);
|
||||
});
|
||||
|
||||
getAjaxRequest().then(function (request) {
|
||||
getAjaxRequest().then(function(request) {
|
||||
request.respondWith({
|
||||
status: 200,
|
||||
responseText: 'OK'
|
||||
@@ -86,4 +89,30 @@ describe('cancel', function() {
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
it('it should support cancellation using AbortController signal', function(done) {
|
||||
var controller = new AbortController();
|
||||
|
||||
axios.get('/foo/bar', {
|
||||
signal: controller.signal
|
||||
}).then(function() {
|
||||
done.fail('Has not been canceled');
|
||||
},
|
||||
function(thrown) {
|
||||
expect(thrown).toEqual(jasmine.any(Cancel));
|
||||
done();
|
||||
}
|
||||
);
|
||||
|
||||
getAjaxRequest().then(function (request) {
|
||||
// call cancel() when the request has been sent, but a response has not been received
|
||||
controller.abort();
|
||||
setTimeout(function(){
|
||||
request.respondWith({
|
||||
status: 200,
|
||||
responseText: 'OK'
|
||||
});
|
||||
}, 0);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -2,23 +2,8 @@
|
||||
|
||||
var validator = require('../../../lib/helpers/validator');
|
||||
|
||||
describe('validator::isOlderVersion', function () {
|
||||
it('should return true if dest version is older than the package version', function () {
|
||||
expect(validator.isOlderVersion('0.0.1', '1.0.0')).toEqual(true);
|
||||
expect(validator.isOlderVersion('0.0.1', '0.1.0')).toEqual(true);
|
||||
expect(validator.isOlderVersion('0.0.1', '0.0.1')).toEqual(false);
|
||||
|
||||
|
||||
expect(validator.isOlderVersion('100.0.0', '1.0.0')).toEqual(false);
|
||||
expect(validator.isOlderVersion('100.0.0', '0.1.0')).toEqual(false);
|
||||
expect(validator.isOlderVersion('100.0.0', '0.0.1')).toEqual(false);
|
||||
|
||||
expect(validator.isOlderVersion('0.10000.0', '1000.0.1')).toEqual(true);
|
||||
});
|
||||
});
|
||||
|
||||
describe('validator::assertOptions', function () {
|
||||
it('should throw only if unknown an option was passed', function () {
|
||||
describe('validator::assertOptions', function() {
|
||||
it('should throw only if unknown an option was passed', function() {
|
||||
expect(function() {
|
||||
validator.assertOptions({
|
||||
x: true
|
||||
@@ -37,7 +22,7 @@ describe('validator::assertOptions', function () {
|
||||
}).not.toThrow(new Error('Unknown option x'));
|
||||
});
|
||||
|
||||
it('should throw TypeError only if option type doesn\'t match', function () {
|
||||
it('should throw TypeError only if option type doesn\'t match', function() {
|
||||
expect(function() {
|
||||
validator.assertOptions({
|
||||
x: 123
|
||||
|
||||
@@ -20,6 +20,7 @@ describe('instance', function () {
|
||||
'all',
|
||||
'spread',
|
||||
'isAxiosError',
|
||||
'VERSION',
|
||||
'default'].indexOf(prop) > -1) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -953,7 +953,7 @@ describe('supports http with nodejs', function () {
|
||||
axios.get('http://localhost:4444/', {
|
||||
cancelToken: source.token
|
||||
}).catch(function (thrown) {
|
||||
assert.ok(thrown instanceof axios.Cancel, 'Promise must be rejected with a Cancel obejct');
|
||||
assert.ok(thrown instanceof axios.Cancel, 'Promise must be rejected with a Cancel object');
|
||||
assert.equal(thrown.message, 'Operation has been canceled.');
|
||||
done();
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user