fix sidebar testsupgrade-to-webpack-v4-fix-karma

2 files changed, 38 insertions, 36 deletions

diff --git a/spec/javascripts/sidebar/mock_data.js b/spec/javascripts/sidebar/mock_data.js
index d9e84e35f69..102d2bb050d 100644
--- a/spec/javascripts/sidebar/mock_data.js
+++ b/spec/javascripts/sidebar/mock_data.js
@@ -202,11 +202,11 @@ const mockData = {
 };
 
 mockData.sidebarMockInterceptor = function (request, next) {
-  const body = this.responseMap[request.method.toUpperCase()][request.url];
+  const body = RESPONSE_MAP[request.method.toUpperCase()][request.url];
 
   next(request.respondWith(JSON.stringify(body), {
     status: 200,
   }));
-}.bind(mockData);
+};
 
 export default mockData;
diff --git a/spec/javascripts/sidebar/sidebar_mediator_spec.js b/spec/javascripts/sidebar/sidebar_mediator_spec.js
index 601a951863b..ccaf9a31b62 100644
--- a/spec/javascripts/sidebar/sidebar_mediator_spec.js
+++ b/spec/javascripts/sidebar/sidebar_mediator_spec.js
@@ -7,9 +7,11 @@ import SidebarService from '~/sidebar/services/sidebar_service';
 import Mock from './mock_data';
 
 describe('Sidebar mediator', () => {
+  let mediatorInstance;
+
   beforeEach(() => {
     Vue.http.interceptors.push(Mock.sidebarMockInterceptor);
-    this.mediator = new SidebarMediator(Mock.mediator);
+    mediatorInstance = new SidebarMediator(Mock.mediator);
   });
 
   afterEach(() => {
@@ -20,14 +22,14 @@ describe('Sidebar mediator', () => {
   });
 
   it('assigns yourself ', () => {
-    this.mediator.assignYourself();
+    mediatorInstance.assignYourself();
 
-    expect(this.mediator.store.currentUser).toEqual(Mock.mediator.currentUser);
-    expect(this.mediator.store.assignees[0]).toEqual(Mock.mediator.currentUser);
+    expect(mediatorInstance.store.currentUser).toEqual(Mock.mediator.currentUser);
+    expect(mediatorInstance.store.assignees[0]).toEqual(Mock.mediator.currentUser);
   });
 
   it('saves assignees', (done) => {
-    this.mediator.saveAssignees('issue[assignee_ids]')
+    mediatorInstance.saveAssignees('issue[assignee_ids]')
       .then((resp) => {
         expect(resp.status).toEqual(200);
         done();
@@ -37,11 +39,11 @@ describe('Sidebar mediator', () => {
 
   it('fetches the data', (done) => {
     const mockData = Mock.responseMap.GET['/gitlab-org/gitlab-shell/issues/5.json?serializer=sidebar'];
-    spyOn(this.mediator, 'processFetchedData').and.callThrough();
+    spyOn(mediatorInstance, 'processFetchedData').and.callThrough();
 
-    this.mediator.fetch()
+    mediatorInstance.fetch()
       .then(() => {
-        expect(this.mediator.processFetchedData).toHaveBeenCalledWith(mockData);
+        expect(mediatorInstance.processFetchedData).toHaveBeenCalledWith(mockData);
       })
       .then(done)
       .catch(done.fail);
@@ -49,35 +51,35 @@ describe('Sidebar mediator', () => {
 
   it('processes fetched data', () => {
     const mockData = Mock.responseMap.GET['/gitlab-org/gitlab-shell/issues/5.json?serializer=sidebar'];
-    this.mediator.processFetchedData(mockData);
-
-    expect(this.mediator.store.assignees).toEqual(mockData.assignees);
-    expect(this.mediator.store.humanTimeEstimate).toEqual(mockData.human_time_estimate);
-    expect(this.mediator.store.humanTotalTimeSpent).toEqual(mockData.human_total_time_spent);
-    expect(this.mediator.store.participants).toEqual(mockData.participants);
-    expect(this.mediator.store.subscribed).toEqual(mockData.subscribed);
-    expect(this.mediator.store.timeEstimate).toEqual(mockData.time_estimate);
-    expect(this.mediator.store.totalTimeSpent).toEqual(mockData.total_time_spent);
+    mediatorInstance.processFetchedData(mockData);
+
+    expect(mediatorInstance.store.assignees).toEqual(mockData.assignees);
+    expect(mediatorInstance.store.humanTimeEstimate).toEqual(mockData.human_time_estimate);
+    expect(mediatorInstance.store.humanTotalTimeSpent).toEqual(mockData.human_total_time_spent);
+    expect(mediatorInstance.store.participants).toEqual(mockData.participants);
+    expect(mediatorInstance.store.subscribed).toEqual(mockData.subscribed);
+    expect(mediatorInstance.store.timeEstimate).toEqual(mockData.time_estimate);
+    expect(mediatorInstance.store.totalTimeSpent).toEqual(mockData.total_time_spent);
   });
 
   it('sets moveToProjectId', () => {
     const projectId = 7;
-    spyOn(this.mediator.store, 'setMoveToProjectId').and.callThrough();
+    spyOn(mediatorInstance.store, 'setMoveToProjectId').and.callThrough();
 
-    this.mediator.setMoveToProjectId(projectId);
+    mediatorInstance.setMoveToProjectId(projectId);
 
-    expect(this.mediator.store.setMoveToProjectId).toHaveBeenCalledWith(projectId);
+    expect(mediatorInstance.store.setMoveToProjectId).toHaveBeenCalledWith(projectId);
   });
 
   it('fetches autocomplete projects', (done) => {
     const searchTerm = 'foo';
-    spyOn(this.mediator.service, 'getProjectsAutocomplete').and.callThrough();
-    spyOn(this.mediator.store, 'setAutocompleteProjects').and.callThrough();
+    spyOn(mediatorInstance.service, 'getProjectsAutocomplete').and.callThrough();
+    spyOn(mediatorInstance.store, 'setAutocompleteProjects').and.callThrough();
 
-    this.mediator.fetchAutocompleteProjects(searchTerm)
+    mediatorInstance.fetchAutocompleteProjects(searchTerm)
       .then(() => {
-        expect(this.mediator.service.getProjectsAutocomplete).toHaveBeenCalledWith(searchTerm);
-        expect(this.mediator.store.setAutocompleteProjects).toHaveBeenCalled();
+        expect(mediatorInstance.service.getProjectsAutocomplete).toHaveBeenCalledWith(searchTerm);
+        expect(mediatorInstance.store.setAutocompleteProjects).toHaveBeenCalled();
       })
       .then(done)
       .catch(done.fail);
@@ -85,13 +87,13 @@ describe('Sidebar mediator', () => {
 
   it('moves issue', (done) => {
     const moveToProjectId = 7;
-    this.mediator.store.setMoveToProjectId(moveToProjectId);
-    spyOn(this.mediator.service, 'moveIssue').and.callThrough();
+    mediatorInstance.store.setMoveToProjectId(moveToProjectId);
+    spyOn(mediatorInstance.service, 'moveIssue').and.callThrough();
     spyOn(urlUtils, 'visitUrl');
 
-    this.mediator.moveIssue()
+    mediatorInstance.moveIssue()
       .then(() => {
-        expect(this.mediator.service.moveIssue).toHaveBeenCalledWith(moveToProjectId);
+        expect(mediatorInstance.service.moveIssue).toHaveBeenCalledWith(moveToProjectId);
         expect(urlUtils.visitUrl).toHaveBeenCalledWith('/root/some-project/issues/5');
       })
       .then(done)
@@ -99,13 +101,13 @@ describe('Sidebar mediator', () => {
   });
 
   it('toggle subscription', (done) => {
-    this.mediator.store.setSubscribedState(false);
-    spyOn(this.mediator.service, 'toggleSubscription').and.callThrough();
+    mediatorInstance.store.setSubscribedState(false);
+    spyOn(mediatorInstance.service, 'toggleSubscription').and.callThrough();
 
-    this.mediator.toggleSubscription()
+    mediatorInstance.toggleSubscription()
       .then(() => {
-        expect(this.mediator.service.toggleSubscription).toHaveBeenCalled();
-        expect(this.mediator.store.subscribed).toEqual(true);
+        expect(mediatorInstance.service.toggleSubscription).toHaveBeenCalled();
+        expect(mediatorInstance.store.subscribed).toEqual(true);
       })
       .then(done)
       .catch(done.fail);