From ce22977fb6a70e75ada07b9a670cfc079bb4fd26 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Wed, 1 Nov 2017 12:46:05 +0000 Subject: Use settimeoutpromise in field_spec --- .../vue_shared/components/markdown/field_spec.js | 37 ++++++++-------------- 1 file 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); }); }); -- cgit v1.2.1