Merge branch 'master' into snake-casesnake-case

1 files changed, 10 insertions, 0 deletions

diff --git a/spec/javascripts/test_bundle.js b/spec/javascripts/test_bundle.js
index 2f6691df9cd..9b2a5379855 100644
--- a/spec/javascripts/test_bundle.js
+++ b/spec/javascripts/test_bundle.js
@@ -6,6 +6,8 @@ import '~/commons';
 import Vue from 'vue';
 import VueResource from 'vue-resource';
 
+import { getDefaultAdapter } from '~/lib/utils/axios_utils';
+
 const isHeadlessChrome = /\bHeadlessChrome\//.test(navigator.userAgent);
 Vue.config.devtools = !isHeadlessChrome;
 Vue.config.productionTip = false;
@@ -59,6 +61,8 @@ beforeEach(() => {
   Vue.http.interceptors = builtinVueHttpInterceptors.slice();
 });
 
+const axiosDefaultAdapter = getDefaultAdapter();
+
 // render all of our tests
 const testsContext = require.context('.', true, /_spec$/);
 testsContext.keys().forEach(function (path) {
@@ -94,6 +98,12 @@ describe('test errors', () => {
   it('has no Vue error', () => {
     expect(hasVueErrors).toBe(false);
   });
+
+  it('restores axios adapter after mocking', () => {
+    if (getDefaultAdapter() !== axiosDefaultAdapter) {
+      fail('axios adapter is not restored! Did you forget a restore() on MockAdapter?');
+    }
+  });
 });
 
 // if we're generating coverage reports, make sure to include all files so