diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-05-11 18:03:48 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-05-11 18:03:48 +0000 |
| commit | 010a349710fadc01ab1b56b7dc47e4926315cf28 (patch) | |
| tree | 7a6ba0a9069aab706fda5af53fb377a9d61675fd | |
| parent | ea5d43a3b8c01fb83d215a7eb15f246f26a34c64 (diff) | |
| parent | 75e613459df3ef8630800af29e11ea3767d92d7f (diff) | |
| download | gitlab-ce-010a349710fadc01ab1b56b7dc47e4926315cf28.tar.gz | |
Merge branch 'winh-sidebar-mock-fix' into 'master'
Add missing tear down of sidebarMockInterceptor
Closes #32020
See merge request !11204
| -rw-r--r-- | spec/javascripts/sidebar/sidebar_assignees_spec.js | 1 | ||||
| -rw-r--r-- | spec/javascripts/sidebar/sidebar_mediator_spec.js | 1 | ||||
| -rw-r--r-- | spec/javascripts/sidebar/sidebar_service_spec.js | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/spec/javascripts/sidebar/sidebar_assignees_spec.js b/spec/javascripts/sidebar/sidebar_assignees_spec.js index e0df0a3228f..865951b2ad7 100644 --- a/spec/javascripts/sidebar/sidebar_assignees_spec.js +++ b/spec/javascripts/sidebar/sidebar_assignees_spec.js @@ -24,6 +24,7 @@ describe('sidebar assignees', () => { SidebarService.singleton = null; SidebarStore.singleton = null; SidebarMediator.singleton = null; + Vue.http.interceptors = _.without(Vue.http.interceptors, Mock.sidebarMockInterceptor); }); it('calls the mediator when saves the assignees', () => { diff --git a/spec/javascripts/sidebar/sidebar_mediator_spec.js b/spec/javascripts/sidebar/sidebar_mediator_spec.js index 2b00fa17334..e246f41ee82 100644 --- a/spec/javascripts/sidebar/sidebar_mediator_spec.js +++ b/spec/javascripts/sidebar/sidebar_mediator_spec.js @@ -14,6 +14,7 @@ describe('Sidebar mediator', () => { SidebarService.singleton = null; SidebarStore.singleton = null; SidebarMediator.singleton = null; + Vue.http.interceptors = _.without(Vue.http.interceptors, Mock.sidebarMockInterceptor); }); it('assigns yourself ', () => { diff --git a/spec/javascripts/sidebar/sidebar_service_spec.js b/spec/javascripts/sidebar/sidebar_service_spec.js index d41162096a6..91a4dd669a7 100644 --- a/spec/javascripts/sidebar/sidebar_service_spec.js +++ b/spec/javascripts/sidebar/sidebar_service_spec.js @@ -10,6 +10,7 @@ describe('Sidebar service', () => { afterEach(() => { SidebarService.singleton = null; + Vue.http.interceptors = _.without(Vue.http.interceptors, Mock.sidebarMockInterceptor); }); it('gets the data', (done) => { |