Merge branch 'winh-axios-mock-restore-ee' into 'master'

Use restore() instead of reset() for removing axios MockAdapter

See merge request gitlab-org/gitlab-ee!4217

doc/development/fe_guide/axios.md

@@ -63,7 +63,7 @@ We have also decided against using [axios interceptors] because they are not sui
   });
 
   afterEach(() => {
-    mock.reset();
+    mock.restore();
   });
 ```
 

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', () => {

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', () => {

spec/javascripts/boards/board_list_spec.js

@@ -60,7 +60,7 @@ describe('Board list component', () => {
   });
 
   afterEach(() => {
-    mock.reset();
+    mock.restore();
   });
 
   it('renders component', () => {

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) => {

spec/javascripts/boards/boards_store_spec.js

@@ -34,7 +34,7 @@ describe('Store', () => {
   });
 
   afterEach(() => {
-    mock.reset();
+    mock.restore();
   });
 
   it('starts with a blank state', () => {

spec/javascripts/boards/list_spec.js

@@ -30,7 +30,7 @@ describe('List model', () => {
   });
 
   afterEach(() => {
-    mock.reset();
+    mock.restore();
   });
 
   it('gets issues when created', (done) => {

spec/javascripts/epics/epic_show/components/epic_show_app_spec.js

@@ -78,7 +78,7 @@ describe('EpicShowApp', () => {
   });
 
   afterEach(() => {
-    mock.reset();
+    mock.restore();
   });
 
   it('should render epic-header', () => {

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();

spec/javascripts/monitoring/dashboard_spec.js

@@ -38,7 +38,7 @@ describe('Dashboard', () => {
     });
 
     afterEach(() => {
-      mock.reset();
+      mock.restore();
     });
 
     it('shows up a loading state', (done) => {

spec/javascripts/vue_mr_widget/ee_mr_widget_options_spec.js

@@ -64,7 +64,7 @@ describe('ee merge request widget options', () => {
       });
 
       afterEach(() => {
-        mock.reset();
+        mock.restore();
       });
 
       it('should render provided data', (done) => {
@@ -87,7 +87,7 @@ describe('ee merge request widget options', () => {
       });
 
       afterEach(() => {
-        mock.reset();
+        mock.restore();
       });
 
       it('should render provided data', (done) => {
@@ -110,7 +110,7 @@ describe('ee merge request widget options', () => {
       });
 
       afterEach(() => {
-        mock.reset();
+        mock.restore();
       });
 
       it('should render error indicator', (done) => {
@@ -158,7 +158,7 @@ describe('ee merge request widget options', () => {
       });
 
       afterEach(() => {
-        mock.reset();
+        mock.restore();
       });
 
       it('should render provided data', (done) => {
@@ -209,7 +209,7 @@ describe('ee merge request widget options', () => {
       });
 
       afterEach(() => {
-        mock.reset();
+        mock.restore();
       });
 
       it('should render provided data', (done) => {
@@ -233,7 +233,7 @@ describe('ee merge request widget options', () => {
       });
 
       afterEach(() => {
-        mock.reset();
+        mock.restore();
       });
 
       it('should render error indicator', (done) => {
@@ -279,7 +279,7 @@ describe('ee merge request widget options', () => {
       });
 
       afterEach(() => {
-        mock.reset();
+        mock.restore();
       });
 
       it('should render provided data', (done) => {
@@ -331,7 +331,7 @@ describe('ee merge request widget options', () => {
       });
 
       afterEach(() => {
-        mock.reset();
+        mock.restore();
       });
 
       it('should render provided data', (done) => {
@@ -355,7 +355,7 @@ describe('ee merge request widget options', () => {
       });
 
       afterEach(() => {
-        mock.reset();
+        mock.restore();
       });
 
       it('should render error indicator', (done) => {
@@ -401,7 +401,7 @@ describe('ee merge request widget options', () => {
       });
 
       afterEach(() => {
-        mock.reset();
+        mock.restore();
       });
 
       it('should render provided data', (done) => {
@@ -440,7 +440,7 @@ describe('ee merge request widget options', () => {
       });
 
       afterEach(() => {
-        mock.reset();
+        mock.restore();
       });
 
       it('should render error indicator', (done) => {
@@ -487,7 +487,7 @@ describe('ee merge request widget options', () => {
       });
 
       afterEach(() => {
-        mock.reset();
+        mock.restore();
       });
 
       it('should render provided data', (done) => {
@@ -518,7 +518,7 @@ describe('ee merge request widget options', () => {
       });
 
       afterEach(() => {
-        mock.reset();
+        mock.restore();
       });
 
       it('should render error indicator', (done) => {