diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-10-30 12:49:55 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-10-30 12:49:55 +0000 |
| commit | e10ca5eb843f45123ef96c0858d2ff76c9892b8c (patch) | |
| tree | 41daa0e3397be8cce10994f2e3d2688d96095e45 /spec | |
| parent | 6fd7a2dc066267e3cd217ebee19df2482d92d30e (diff) | |
| parent | 557cf4fa7633c65e7beacb273550de85cb9e130e (diff) | |
| download | gitlab-ce-e10ca5eb843f45123ef96c0858d2ff76c9892b8c.tar.gz | |
Merge branch 'winh-pipeline-actions-dynamic-timer' into 'master'
Add dynamic timer for delayed jobs in pipelines list
See merge request gitlab-org/gitlab-ce!22621
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/javascripts/pipelines/pipelines_actions_spec.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/javascripts/pipelines/pipelines_actions_spec.js b/spec/javascripts/pipelines/pipelines_actions_spec.js index b5c62178642..a7dcd532f4f 100644 --- a/spec/javascripts/pipelines/pipelines_actions_spec.js +++ b/spec/javascripts/pipelines/pipelines_actions_spec.js @@ -62,9 +62,13 @@ describe('Pipelines Actions dropdown', () => { ); }; - beforeEach(() => { + beforeEach(done => { spyOn(Date, 'now').and.callFake(() => new Date('2063-04-04T00:42:00Z').getTime()); vm = mountComponent(Component, { actions: [scheduledJobAction, expiredJobAction] }); + + Vue.nextTick() + .then(done) + .catch(done.fail); }); it('emits postAction event after confirming', () => { |