summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-11-01 12:46:05 +0000
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-11-01 12:46:05 +0000
commitce22977fb6a70e75ada07b9a670cfc079bb4fd26 (patch)
tree2c019c2a8e4d61dc36c8ce92e239732cde76075f
parentaf13ffbcedd8952433d4d3f6693aac3450c5fa6f (diff)
downloadgitlab-ce-ce22977fb6a70e75ada07b9a670cfc079bb4fd26.tar.gz
Use settimeoutpromise in field_spec
-rw-r--r--spec/javascripts/vue_shared/components/markdown/field_spec.js37
1 files changed, 14 insertions, 23 deletions
diff --git a/spec/javascripts/vue_shared/components/markdown/field_spec.js b/spec/javascripts/vue_shared/components/markdown/field_spec.js
index 734266d0ebb..40cfafdf792 100644
--- a/spec/javascripts/vue_shared/components/markdown/field_spec.js
+++ b/spec/javascripts/vue_shared/components/markdown/field_spec.js
@@ -1,5 +1,6 @@
import Vue from 'vue';
import fieldComponent from '~/vue_shared/components/markdown/field.vue';
+import setTimeoutPromise from '../../../helpers/set_timeout_promise_helper';
describe('Markdown field component', () => {
let vm;
@@ -115,29 +116,19 @@ describe('Markdown field component', () => {
it('clicking already active write or preview link does nothing', (done) => {
writeLink.click();
- setTimeout(() => {
- assertLinks(true);
-
- writeLink.click();
-
- setTimeout(() => {
- assertLinks(true);
-
- previewLink.click();
-
- setTimeout(() => {
- assertLinks(false);
-
- previewLink.click();
-
- setTimeout(() => {
- assertLinks(false);
-
- done();
- });
- });
- });
- });
+ setTimeoutPromise()
+ .then(() => assertLinks(true))
+ .then(() => writeLink.click())
+ .then(() => setTimeoutPromise())
+ .then(() => assertLinks(true))
+ .then(() => previewLink.click())
+ .then(() => setTimeoutPromise())
+ .then(() => assertLinks(false))
+ .then(() => previewLink.click())
+ .then(() => setTimeoutPromise())
+ .then(() => assertLinks(false))
+ .then(done)
+ .catch(done.fail);
});
});