Merge branch 'winh-axios-mock-restore' into 'master'
Use restore() instead of reset() for removing axios MockAdapter See merge request gitlab-org/gitlab-ce!16647
This commit is contained in:
commit
0f5f77a04c
|
@ -63,7 +63,7 @@ We have also decided against using [axios interceptors] because they are not sui
|
|||
});
|
||||
|
||||
afterEach(() => {
|
||||
mock.reset();
|
||||
mock.restore();
|
||||
});
|
||||
```
|
||||
|
||||
|
|
|
@ -45,7 +45,7 @@ describe('iPython notebook renderer', () => {
|
|||
});
|
||||
|
||||
afterEach(() => {
|
||||
mock.reset();
|
||||
mock.restore();
|
||||
});
|
||||
|
||||
it('does not show loading icon', () => {
|
||||
|
@ -96,7 +96,7 @@ describe('iPython notebook renderer', () => {
|
|||
});
|
||||
|
||||
afterEach(() => {
|
||||
mock.reset();
|
||||
mock.restore();
|
||||
});
|
||||
|
||||
it('does not show loading icon', () => {
|
||||
|
@ -127,7 +127,7 @@ describe('iPython notebook renderer', () => {
|
|||
});
|
||||
|
||||
afterEach(() => {
|
||||
mock.reset();
|
||||
mock.restore();
|
||||
});
|
||||
|
||||
it('does not show loading icon', () => {
|
||||
|
|
|
@ -55,7 +55,7 @@ describe('Board card', () => {
|
|||
});
|
||||
|
||||
afterEach(() => {
|
||||
mock.reset();
|
||||
mock.restore();
|
||||
});
|
||||
|
||||
it('returns false when detailIssue is empty', () => {
|
||||
|
|
|
@ -60,7 +60,7 @@ describe('Board list component', () => {
|
|||
});
|
||||
|
||||
afterEach(() => {
|
||||
mock.reset();
|
||||
mock.restore();
|
||||
});
|
||||
|
||||
it('renders component', () => {
|
||||
|
|
|
@ -58,7 +58,7 @@ describe('Issue boards new issue form', () => {
|
|||
|
||||
afterEach(() => {
|
||||
vm.$destroy();
|
||||
mock.reset();
|
||||
mock.restore();
|
||||
});
|
||||
|
||||
it('calls submit if submit button is clicked', (done) => {
|
||||
|
|
|
@ -35,7 +35,7 @@ describe('Store', () => {
|
|||
});
|
||||
|
||||
afterEach(() => {
|
||||
mock.reset();
|
||||
mock.restore();
|
||||
});
|
||||
|
||||
it('starts with a blank state', () => {
|
||||
|
|
|
@ -30,7 +30,7 @@ describe('List model', () => {
|
|||
});
|
||||
|
||||
afterEach(() => {
|
||||
mock.reset();
|
||||
mock.restore();
|
||||
});
|
||||
|
||||
it('gets issues when created', (done) => {
|
||||
|
|
|
@ -59,7 +59,7 @@ describe('Issuable output', () => {
|
|||
});
|
||||
|
||||
afterEach(() => {
|
||||
mock.reset();
|
||||
mock.restore();
|
||||
realtimeRequestCount = 0;
|
||||
|
||||
vm.poll.stop();
|
||||
|
|
|
@ -12,6 +12,10 @@ describe('JobMediator', () => {
|
|||
mock = new MockAdapter(axios);
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
mock.restore();
|
||||
});
|
||||
|
||||
it('should set defaults', () => {
|
||||
expect(mediator.store).toBeDefined();
|
||||
expect(mediator.service).toBeDefined();
|
||||
|
@ -24,10 +28,6 @@ describe('JobMediator', () => {
|
|||
mock.onGet().reply(200, job, {});
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
mock.restore();
|
||||
});
|
||||
|
||||
it('should store received data', (done) => {
|
||||
mediator.fetchJob();
|
||||
setTimeout(() => {
|
||||
|
|
|
@ -38,7 +38,7 @@ describe('Dashboard', () => {
|
|||
});
|
||||
|
||||
afterEach(() => {
|
||||
mock.reset();
|
||||
mock.restore();
|
||||
});
|
||||
|
||||
it('shows up a loading state', (done) => {
|
||||
|
|
Loading…
Reference in New Issue