Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 5 deletions

diff --git a/spec/javascripts/boards/components/boards_selector_spec.js b/spec/javascripts/boards/components/boards_selector_spec.js
index 473cc0612ea..d1f36a0a652 100644
--- a/spec/javascripts/boards/components/boards_selector_spec.js
+++ b/spec/javascripts/boards/components/boards_selector_spec.js
@@ -1,5 +1,4 @@
 import Vue from 'vue';
-import BoardService from '~/boards/services/board_service';
 import BoardsSelector from '~/boards/components/boards_selector.vue';
 import mountComponent from 'spec/helpers/vue_mount_component_helper';
 import { TEST_HOST } from 'spec/test_constants';
@@ -37,7 +36,6 @@ describe('BoardsSelector', () => {
       bulkUpdatePath: '',
       boardId: '',
     });
-    window.gl.boardService = new BoardService();
 
     allBoardsResponse = Promise.resolve({
       data: boards,
@@ -46,8 +44,8 @@ describe('BoardsSelector', () => {
       data: recentBoards,
     });
 
-    spyOn(BoardService.prototype, 'allBoards').and.returnValue(allBoardsResponse);
-    spyOn(BoardService.prototype, 'recentBoards').and.returnValue(recentBoardsResponse);
+    spyOn(boardsStore, 'allBoards').and.returnValue(allBoardsResponse);
+    spyOn(boardsStore, 'recentBoards').and.returnValue(recentBoardsResponse);
 
     const Component = Vue.extend(BoardsSelector);
     vm = mountComponent(
@@ -94,7 +92,6 @@ describe('BoardsSelector', () => {
 
   afterEach(() => {
     vm.$destroy();
-    window.gl.boardService = undefined;
   });
 
   describe('filtering', () => {