diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-11 15:14:00 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-11 15:14:00 +0000 |
commit | ec377e41624fb83f0e5e51286c7aad24a22eefb1 (patch) | |
tree | 824901d301b34620d8c488d818762a50d7a6bc12 /spec/frontend/diffs | |
parent | 39c4905723dab98b383e7dc5940caa7f8080c2cc (diff) | |
download | gitlab-ce-ec377e41624fb83f0e5e51286c7aad24a22eefb1.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/diffs')
-rw-r--r-- | spec/frontend/diffs/store/actions_spec.js | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/spec/frontend/diffs/store/actions_spec.js b/spec/frontend/diffs/store/actions_spec.js index b5003a54917..c53789b4800 100644 --- a/spec/frontend/diffs/store/actions_spec.js +++ b/spec/frontend/diffs/store/actions_spec.js @@ -544,10 +544,8 @@ describe('DiffsStoreActions', () => { [{ type: types.SET_DIFF_VIEW_TYPE, payload: INLINE_DIFF_VIEW_TYPE }], [], () => { - setImmediate(() => { - expect(Cookies.get('diff_view')).toEqual(INLINE_DIFF_VIEW_TYPE); - done(); - }); + expect(Cookies.get('diff_view')).toEqual(INLINE_DIFF_VIEW_TYPE); + done(); }, ); }); @@ -562,10 +560,8 @@ describe('DiffsStoreActions', () => { [{ type: types.SET_DIFF_VIEW_TYPE, payload: PARALLEL_DIFF_VIEW_TYPE }], [], () => { - setImmediate(() => { - expect(Cookies.get(DIFF_VIEW_COOKIE_NAME)).toEqual(PARALLEL_DIFF_VIEW_TYPE); - done(); - }); + expect(Cookies.get(DIFF_VIEW_COOKIE_NAME)).toEqual(PARALLEL_DIFF_VIEW_TYPE); + done(); }, ); }); |