enable jasmine/no-promise-without-done-fail

parent 1dfecf3e
...@@ -37,5 +37,4 @@ rules: ...@@ -37,5 +37,4 @@ rules:
- 'fixtures/blob' - 'fixtures/blob'
# Temporarily disabled to facilitate an upgrade to eslint-plugin-jasmine # Temporarily disabled to facilitate an upgrade to eslint-plugin-jasmine
jasmine/new-line-before-expect: off jasmine/new-line-before-expect: off
jasmine/no-promise-without-done-fail: off
jasmine/prefer-toHaveBeenCalledWith: off jasmine/prefer-toHaveBeenCalledWith: off
...@@ -112,6 +112,6 @@ describe('Board component', () => { ...@@ -112,6 +112,6 @@ describe('Board component', () => {
).toBe(true); ).toBe(true);
done(); done();
}); }).catch(done.fail);
}); });
}); });
/* eslint-disable promise/catch-or-return */
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import * as commonUtils from '~/lib/utils/common_utils'; import * as commonUtils from '~/lib/utils/common_utils';
import MockAdapter from 'axios-mock-adapter'; import MockAdapter from 'axios-mock-adapter';
...@@ -360,10 +359,10 @@ describe('common_utils', () => { ...@@ -360,10 +359,10 @@ describe('common_utils', () => {
}).then((resp) => { }).then((resp) => {
stop(resp); stop(resp);
}) })
)).then((respBackoff) => { ).catch(done.fail)).then((respBackoff) => {
expect(respBackoff).toBe(expectedResponseValue); expect(respBackoff).toBe(expectedResponseValue);
done(); done();
}); }).catch(done.fail);
}); });
it('catches the rejected promise from the callback ', (done) => { it('catches the rejected promise from the callback ', (done) => {
...@@ -394,12 +393,12 @@ describe('common_utils', () => { ...@@ -394,12 +393,12 @@ describe('common_utils', () => {
stop(resp); stop(resp);
} }
}) })
)).then((respBackoff) => { ).catch(done.fail)).then((respBackoff) => {
const timeouts = window.setTimeout.calls.allArgs().map(([, timeout]) => timeout); const timeouts = window.setTimeout.calls.allArgs().map(([, timeout]) => timeout);
expect(timeouts).toEqual([2000, 4000]); expect(timeouts).toEqual([2000, 4000]);
expect(respBackoff).toBe(expectedResponseValue); expect(respBackoff).toBe(expectedResponseValue);
done(); done();
}); }).catch(done.fail);
}); });
it('rejects the backOff promise after timing out', (done) => { it('rejects the backOff promise after timing out', (done) => {
...@@ -460,7 +459,7 @@ describe('common_utils', () => { ...@@ -460,7 +459,7 @@ describe('common_utils', () => {
commonUtils.createOverlayIcon(faviconDataUrl, overlayDataUrl).then((url) => { commonUtils.createOverlayIcon(faviconDataUrl, overlayDataUrl).then((url) => {
expect(url).toEqual(faviconWithOverlayDataUrl); expect(url).toEqual(faviconWithOverlayDataUrl);
done(); done();
}); }).catch(done.fail);
}); });
}); });
...@@ -480,7 +479,7 @@ describe('common_utils', () => { ...@@ -480,7 +479,7 @@ describe('common_utils', () => {
commonUtils.setFaviconOverlay(overlayDataUrl).then(() => { commonUtils.setFaviconOverlay(overlayDataUrl).then(() => {
expect(document.getElementById('favicon').getAttribute('href')).toEqual(faviconWithOverlayDataUrl); expect(document.getElementById('favicon').getAttribute('href')).toEqual(faviconWithOverlayDataUrl);
done(); done();
}); }).catch(done.fail);
}); });
}); });
......
...@@ -719,7 +719,7 @@ describe('Pipelines', () => { ...@@ -719,7 +719,7 @@ describe('Pipelines', () => {
expect(vm.poll.restart).toHaveBeenCalled(); expect(vm.poll.restart).toHaveBeenCalled();
done(); done();
}, 0); }, 0);
}); }).catch(done.fail);
}, 0); }, 0);
}); });
}); });
......
...@@ -96,8 +96,8 @@ describe('GkeMachineTypeDropdown', () => { ...@@ -96,8 +96,8 @@ describe('GkeMachineTypeDropdown', () => {
return vm.$nextTick().then(() => { return vm.$nextTick().then(() => {
expect(vm.$el.querySelector('input').value).toBe(selectedMachineTypeMock); expect(vm.$el.querySelector('input').value).toBe(selectedMachineTypeMock);
done(); done();
}); }).catch(done.fail);
}); }).catch(done.fail);
}); });
}); });
}); });
...@@ -57,13 +57,13 @@ describe('GkeProjectIdDropdown', () => { ...@@ -57,13 +57,13 @@ describe('GkeProjectIdDropdown', () => {
expect(vm.toggleText).toBe(LABELS.DEFAULT); expect(vm.toggleText).toBe(LABELS.DEFAULT);
done(); done();
})); }).catch(done.fail));
it('returns project name if project selected', done => it('returns project name if project selected', done =>
vm.$nextTick().then(() => { vm.$nextTick().then(() => {
expect(vm.toggleText).toBe(selectedProjectMock.name); expect(vm.toggleText).toBe(selectedProjectMock.name);
done(); done();
})); }).catch(done.fail));
it('returns empty toggle text', done => it('returns empty toggle text', done =>
vm.$nextTick().then(() => { vm.$nextTick().then(() => {
...@@ -72,7 +72,7 @@ describe('GkeProjectIdDropdown', () => { ...@@ -72,7 +72,7 @@ describe('GkeProjectIdDropdown', () => {
expect(vm.toggleText).toBe(LABELS.EMPTY); expect(vm.toggleText).toBe(LABELS.EMPTY);
done(); done();
})); }).catch(done.fail));
}); });
describe('selectItem', () => { describe('selectItem', () => {
...@@ -85,8 +85,8 @@ describe('GkeProjectIdDropdown', () => { ...@@ -85,8 +85,8 @@ describe('GkeProjectIdDropdown', () => {
return vm.$nextTick().then(() => { return vm.$nextTick().then(() => {
expect(vm.$el.querySelector('input').value).toBe(selectedProjectMock.projectId); expect(vm.$el.querySelector('input').value).toBe(selectedProjectMock.projectId);
done(); done();
}); }).catch(done.fail);
}); }).catch(done.fail);
}); });
}); });
}); });
...@@ -81,8 +81,8 @@ describe('GkeZoneDropdown', () => { ...@@ -81,8 +81,8 @@ describe('GkeZoneDropdown', () => {
return vm.$nextTick().then(() => { return vm.$nextTick().then(() => {
expect(vm.$el.querySelector('input').value).toBe(selectedZoneMock); expect(vm.$el.querySelector('input').value).toBe(selectedZoneMock);
done(); done();
}); }).catch(done.fail);
}); }).catch(done.fail);
}); });
}); });
}); });
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment