summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2019-07-11 14:32:37 -0500
committerMike Greiling <mike@pixelcog.com>2019-07-11 14:32:37 -0500
commit7f8585c61831f18aa2d59879d251accda2fcbc7b (patch)
tree75048d9fe3c01b85025c876b7cc464d8bccc26ad /spec
parent97482acb6f74b2ff53eba704930a1a7a8028f1e5 (diff)
downloadgitlab-ce-7f8585c61831f18aa2d59879d251accda2fcbc7b.tar.gz
Update setImmediate use in karma specs64403-remove-setimmediate-polyfill
Diffstat (limited to 'spec')
-rw-r--r--spec/javascripts/helpers/vuex_action_helper.js3
-rw-r--r--spec/javascripts/test_bundle.js1
2 files changed, 3 insertions, 1 deletions
diff --git a/spec/javascripts/helpers/vuex_action_helper.js b/spec/javascripts/helpers/vuex_action_helper.js
index a1ef1bd49ea..c5de31a4138 100644
--- a/spec/javascripts/helpers/vuex_action_helper.js
+++ b/spec/javascripts/helpers/vuex_action_helper.js
@@ -89,7 +89,8 @@ export default (
payload,
);
- return Promise.resolve(result)
+ return new Promise(setImmediate)
+ .then(() => result)
.catch(error => {
validateResults();
throw error;
diff --git a/spec/javascripts/test_bundle.js b/spec/javascripts/test_bundle.js
index 50741e249ca..ce453d7c483 100644
--- a/spec/javascripts/test_bundle.js
+++ b/spec/javascripts/test_bundle.js
@@ -3,6 +3,7 @@
*/
import $ from 'jquery';
+import 'core-js/features/set-immediate';
import 'vendor/jasmine-jquery';
import '~/commons';
import Vue from 'vue';