From 0711ebbd72b4e59b25bee2b0ba2444eecd3cfa7e Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Tue, 23 Jan 2018 12:42:02 +0100
Subject: [PATCH] Use restore() instead of reset() for removing axios
 MockAdapter

---
 doc/development/fe_guide/axios.md                  | 2 +-
 spec/javascripts/blob/notebook/index_spec.js       | 6 +++---
 spec/javascripts/boards/board_card_spec.js         | 2 +-
 spec/javascripts/boards/board_list_spec.js         | 2 +-
 spec/javascripts/boards/board_new_issue_spec.js    | 2 +-
 spec/javascripts/boards/boards_store_spec.js       | 2 +-
 spec/javascripts/boards/list_spec.js               | 2 +-
 spec/javascripts/issue_show/components/app_spec.js | 2 +-
 spec/javascripts/jobs/job_details_mediator_spec.js | 8 ++++----
 spec/javascripts/monitoring/dashboard_spec.js      | 2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/doc/development/fe_guide/axios.md b/doc/development/fe_guide/axios.md
index 34fa684c5d6..71c793a293f 100644
--- a/doc/development/fe_guide/axios.md
+++ b/doc/development/fe_guide/axios.md
@@ -50,7 +50,7 @@ To help us mock the responses we need we use [axios-mock-adapter][axios-mock-ada
   });
 
   afterEach(() => {
-    mock.reset();
+    mock.restore();
   });
 ```
 
diff --git a/spec/javascripts/blob/notebook/index_spec.js b/spec/javascripts/blob/notebook/index_spec.js
index df1b2c9960b..a143fc827d5 100644
--- a/spec/javascripts/blob/notebook/index_spec.js
+++ b/spec/javascripts/blob/notebook/index_spec.js
@@ -45,7 +45,7 @@ describe('iPython notebook renderer', () => {
     });
 
     afterEach(() => {
-      mock.reset();
+      mock.restore();
     });
 
     it('does not show loading icon', () => {
@@ -96,7 +96,7 @@ describe('iPython notebook renderer', () => {
     });
 
     afterEach(() => {
-      mock.reset();
+      mock.restore();
     });
 
     it('does not show loading icon', () => {
@@ -127,7 +127,7 @@ describe('iPython notebook renderer', () => {
     });
 
     afterEach(() => {
-      mock.reset();
+      mock.restore();
     });
 
     it('does not show loading icon', () => {
diff --git a/spec/javascripts/boards/board_card_spec.js b/spec/javascripts/boards/board_card_spec.js
index 4e73fa1fe87..80a598e63bd 100644
--- a/spec/javascripts/boards/board_card_spec.js
+++ b/spec/javascripts/boards/board_card_spec.js
@@ -55,7 +55,7 @@ describe('Board card', () => {
   });
 
   afterEach(() => {
-    mock.reset();
+    mock.restore();
   });
 
   it('returns false when detailIssue is empty', () => {
diff --git a/spec/javascripts/boards/board_list_spec.js b/spec/javascripts/boards/board_list_spec.js
index 9ffdac9be97..a5fcb10b9dd 100644
--- a/spec/javascripts/boards/board_list_spec.js
+++ b/spec/javascripts/boards/board_list_spec.js
@@ -60,7 +60,7 @@ describe('Board list component', () => {
   });
 
   afterEach(() => {
-    mock.reset();
+    mock.restore();
   });
 
   it('renders component', () => {
diff --git a/spec/javascripts/boards/board_new_issue_spec.js b/spec/javascripts/boards/board_new_issue_spec.js
index c62c537841c..e204985f039 100644
--- a/spec/javascripts/boards/board_new_issue_spec.js
+++ b/spec/javascripts/boards/board_new_issue_spec.js
@@ -58,7 +58,7 @@ describe('Issue boards new issue form', () => {
 
   afterEach(() => {
     vm.$destroy();
-    mock.reset();
+    mock.restore();
   });
 
   it('calls submit if submit button is clicked', (done) => {
diff --git a/spec/javascripts/boards/boards_store_spec.js b/spec/javascripts/boards/boards_store_spec.js
index 49fb20f4c84..8411f4dd8a6 100644
--- a/spec/javascripts/boards/boards_store_spec.js
+++ b/spec/javascripts/boards/boards_store_spec.js
@@ -35,7 +35,7 @@ describe('Store', () => {
   });
 
   afterEach(() => {
-    mock.reset();
+    mock.restore();
   });
 
   it('starts with a blank state', () => {
diff --git a/spec/javascripts/boards/list_spec.js b/spec/javascripts/boards/list_spec.js
index e5e7b48228b..34964b20b05 100644
--- a/spec/javascripts/boards/list_spec.js
+++ b/spec/javascripts/boards/list_spec.js
@@ -30,7 +30,7 @@ describe('List model', () => {
   });
 
   afterEach(() => {
-    mock.reset();
+    mock.restore();
   });
 
   it('gets issues when created', (done) => {
diff --git a/spec/javascripts/issue_show/components/app_spec.js b/spec/javascripts/issue_show/components/app_spec.js
index 9280db072b3..1c9f48028f2 100644
--- a/spec/javascripts/issue_show/components/app_spec.js
+++ b/spec/javascripts/issue_show/components/app_spec.js
@@ -59,7 +59,7 @@ describe('Issuable output', () => {
   });
 
   afterEach(() => {
-    mock.reset();
+    mock.restore();
     realtimeRequestCount = 0;
 
     vm.poll.stop();
diff --git a/spec/javascripts/jobs/job_details_mediator_spec.js b/spec/javascripts/jobs/job_details_mediator_spec.js
index 3069a0cd60e..ca5c9cf87e4 100644
--- a/spec/javascripts/jobs/job_details_mediator_spec.js
+++ b/spec/javascripts/jobs/job_details_mediator_spec.js
@@ -12,6 +12,10 @@ describe('JobMediator', () => {
     mock = new MockAdapter(axios);
   });
 
+  afterEach(() => {
+    mock.restore();
+  });
+
   it('should set defaults', () => {
     expect(mediator.store).toBeDefined();
     expect(mediator.service).toBeDefined();
@@ -24,10 +28,6 @@ describe('JobMediator', () => {
       mock.onGet().reply(200, job, {});
     });
 
-    afterEach(() => {
-      mock.restore();
-    });
-
     it('should store received data', (done) => {
       mediator.fetchJob();
       setTimeout(() => {
diff --git a/spec/javascripts/monitoring/dashboard_spec.js b/spec/javascripts/monitoring/dashboard_spec.js
index 9885b8a790f..eb8f6bbe50d 100644
--- a/spec/javascripts/monitoring/dashboard_spec.js
+++ b/spec/javascripts/monitoring/dashboard_spec.js
@@ -38,7 +38,7 @@ describe('Dashboard', () => {
     });
 
     afterEach(() => {
-      mock.reset();
+      mock.restore();
     });
 
     it('shows up a loading state', (done) => {