From 19371b9062664ccb75f61825da1924187750a6a9 Mon Sep 17 00:00:00 2001
From: Lee Tickett <lee@tickett.net>
Date: Tue, 3 Sep 2019 19:10:08 +0000
Subject: Revert "DB change, migratoin and changelog"

This reverts commit af5242ecb682189c5d8276e1ab1ffe5ce844f2e5.
---
 spec/javascripts/sidebar/mock_data.js               | 10 ----------
 spec/javascripts/sidebar/sidebar_mediator_spec.js   | 19 +++++++++++++++----
 spec/javascripts/sidebar/sidebar_move_issue_spec.js | 13 ++++++++-----
 3 files changed, 23 insertions(+), 19 deletions(-)

(limited to 'spec')

diff --git a/spec/javascripts/sidebar/mock_data.js b/spec/javascripts/sidebar/mock_data.js
index 7f20b0da991..3ee97b978fd 100644
--- a/spec/javascripts/sidebar/mock_data.js
+++ b/spec/javascripts/sidebar/mock_data.js
@@ -210,14 +210,4 @@ const mockData = {
   },
 };
 
-mockData.sidebarMockInterceptor = function(request, next) {
-  const body = this.responseMap[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 6c69c08e733..2e5845cd847 100644
--- a/spec/javascripts/sidebar/sidebar_mediator_spec.js
+++ b/spec/javascripts/sidebar/sidebar_mediator_spec.js
@@ -1,13 +1,16 @@
-import _ from 'underscore';
-import Vue from 'vue';
+import MockAdapter from 'axios-mock-adapter';
+import axios from '~/lib/utils/axios_utils';
 import SidebarMediator from '~/sidebar/sidebar_mediator';
 import SidebarStore from '~/sidebar/stores/sidebar_store';
 import SidebarService from '~/sidebar/services/sidebar_service';
 import Mock from './mock_data';
 
 describe('Sidebar mediator', function() {
+  let mock;
+
   beforeEach(() => {
-    Vue.http.interceptors.push(Mock.sidebarMockInterceptor);
+    mock = new MockAdapter(axios);
+
     this.mediator = new SidebarMediator(Mock.mediator);
   });
 
@@ -15,7 +18,7 @@ describe('Sidebar mediator', function() {
     SidebarService.singleton = null;
     SidebarStore.singleton = null;
     SidebarMediator.singleton = null;
-    Vue.http.interceptors = _.without(Vue.http.interceptors, Mock.sidebarMockInterceptor);
+    mock.restore();
   });
 
   it('assigns yourself ', () => {
@@ -26,6 +29,7 @@ describe('Sidebar mediator', function() {
   });
 
   it('saves assignees', done => {
+    mock.onPut('/gitlab-org/gitlab-shell/issues/5.json?serializer=sidebar_extras').reply(200, {});
     this.mediator
       .saveAssignees('issue[assignee_ids]')
       .then(resp => {
@@ -38,6 +42,9 @@ describe('Sidebar mediator', function() {
   it('fetches the data', done => {
     const mockData =
       Mock.responseMap.GET['/gitlab-org/gitlab-shell/issues/5.json?serializer=sidebar_extras'];
+    mock
+      .onGet('/gitlab-org/gitlab-shell/issues/5.json?serializer=sidebar_extras')
+      .reply(200, mockData);
     spyOn(this.mediator, 'processFetchedData').and.callThrough();
 
     this.mediator
@@ -74,6 +81,7 @@ describe('Sidebar mediator', function() {
 
   it('fetches autocomplete projects', done => {
     const searchTerm = 'foo';
+    mock.onGet('/autocomplete/projects?project_id=15').reply(200, {});
     spyOn(this.mediator.service, 'getProjectsAutocomplete').and.callThrough();
     spyOn(this.mediator.store, 'setAutocompleteProjects').and.callThrough();
 
@@ -88,7 +96,9 @@ describe('Sidebar mediator', function() {
   });
 
   it('moves issue', done => {
+    const mockData = Mock.responseMap.POST['/gitlab-org/gitlab-shell/issues/5/move'];
     const moveToProjectId = 7;
+    mock.onPost('/gitlab-org/gitlab-shell/issues/5/move').reply(200, mockData);
     this.mediator.store.setMoveToProjectId(moveToProjectId);
     spyOn(this.mediator.service, 'moveIssue').and.callThrough();
     const visitUrl = spyOnDependency(SidebarMediator, 'visitUrl');
@@ -105,6 +115,7 @@ describe('Sidebar mediator', function() {
 
   it('toggle subscription', done => {
     this.mediator.store.setSubscribedState(false);
+    mock.onPost('/gitlab-org/gitlab-shell/issues/5/toggle_subscription').reply(200, {});
     spyOn(this.mediator.service, 'toggleSubscription').and.callThrough();
 
     this.mediator
diff --git a/spec/javascripts/sidebar/sidebar_move_issue_spec.js b/spec/javascripts/sidebar/sidebar_move_issue_spec.js
index 230e0a933a9..ec712450f2e 100644
--- a/spec/javascripts/sidebar/sidebar_move_issue_spec.js
+++ b/spec/javascripts/sidebar/sidebar_move_issue_spec.js
@@ -1,6 +1,6 @@
 import $ from 'jquery';
-import _ from 'underscore';
-import Vue from 'vue';
+import MockAdapter from 'axios-mock-adapter';
+import axios from '~/lib/utils/axios_utils';
 import SidebarMediator from '~/sidebar/sidebar_mediator';
 import SidebarStore from '~/sidebar/stores/sidebar_store';
 import SidebarService from '~/sidebar/services/sidebar_service';
@@ -8,8 +8,12 @@ import SidebarMoveIssue from '~/sidebar/lib/sidebar_move_issue';
 import Mock from './mock_data';
 
 describe('SidebarMoveIssue', function() {
+  let mock;
+
   beforeEach(() => {
-    Vue.http.interceptors.push(Mock.sidebarMockInterceptor);
+    mock = new MockAdapter(axios);
+    const mockData = Mock.responseMap.GET['/autocomplete/projects?project_id=15'];
+    mock.onGet('/autocomplete/projects?project_id=15').reply(200, mockData);
     this.mediator = new SidebarMediator(Mock.mediator);
     this.$content = $(`
       <div class="dropdown">
@@ -37,8 +41,7 @@ describe('SidebarMoveIssue', function() {
     SidebarMediator.singleton = null;
 
     this.sidebarMoveIssue.destroy();
-
-    Vue.http.interceptors = _.without(Vue.http.interceptors, Mock.sidebarMockInterceptor);
+    mock.restore();
   });
 
   describe('init', () => {
-- 
cgit v1.2.1