summaryrefslogtreecommitdiff
path: root/spec/javascripts/lib/utils/common_utils_spec.js
diff options
context:
space:
mode:
authorJohann Hubert Sonntagbauer <johann.sonntagbauer@gmail.com>2018-10-09 19:17:36 +0200
committerJohann Hubert Sonntagbauer <johann.sonntagbauer@gmail.com>2018-10-16 21:31:16 +0200
commit0fd203ba2435264ea5814f22094fb13ec052619c (patch)
treedc134630c9a0aa9ab3f4e85a67a7b793304d10a0 /spec/javascripts/lib/utils/common_utils_spec.js
parent1dfecf3e178d541b4e3e53619c3be969c1c051af (diff)
downloadgitlab-ce-0fd203ba2435264ea5814f22094fb13ec052619c.tar.gz
enable jasmine/no-promise-without-done-fail
Diffstat (limited to 'spec/javascripts/lib/utils/common_utils_spec.js')
-rw-r--r--spec/javascripts/lib/utils/common_utils_spec.js13
1 files changed, 6 insertions, 7 deletions
diff --git a/spec/javascripts/lib/utils/common_utils_spec.js b/spec/javascripts/lib/utils/common_utils_spec.js
index c34622203f7..b2b8f64d705 100644
--- a/spec/javascripts/lib/utils/common_utils_spec.js
+++ b/spec/javascripts/lib/utils/common_utils_spec.js
@@ -1,4 +1,3 @@
-/* eslint-disable promise/catch-or-return */
import axios from '~/lib/utils/axios_utils';
import * as commonUtils from '~/lib/utils/common_utils';
import MockAdapter from 'axios-mock-adapter';
@@ -360,10 +359,10 @@ describe('common_utils', () => {
}).then((resp) => {
stop(resp);
})
- )).then((respBackoff) => {
+ ).catch(done.fail)).then((respBackoff) => {
expect(respBackoff).toBe(expectedResponseValue);
done();
- });
+ }).catch(done.fail);
});
it('catches the rejected promise from the callback ', (done) => {
@@ -394,12 +393,12 @@ describe('common_utils', () => {
stop(resp);
}
})
- )).then((respBackoff) => {
+ ).catch(done.fail)).then((respBackoff) => {
const timeouts = window.setTimeout.calls.allArgs().map(([, timeout]) => timeout);
expect(timeouts).toEqual([2000, 4000]);
expect(respBackoff).toBe(expectedResponseValue);
done();
- });
+ }).catch(done.fail);
});
it('rejects the backOff promise after timing out', (done) => {
@@ -460,7 +459,7 @@ describe('common_utils', () => {
commonUtils.createOverlayIcon(faviconDataUrl, overlayDataUrl).then((url) => {
expect(url).toEqual(faviconWithOverlayDataUrl);
done();
- });
+ }).catch(done.fail);
});
});
@@ -480,7 +479,7 @@ describe('common_utils', () => {
commonUtils.setFaviconOverlay(overlayDataUrl).then(() => {
expect(document.getElementById('favicon').getAttribute('href')).toEqual(faviconWithOverlayDataUrl);
done();
- });
+ }).catch(done.fail);
});
});