Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 9 insertions, 4 deletions

diff --git a/spec/frontend/__helpers__/mock_apollo_helper.js b/spec/frontend/__helpers__/mock_apollo_helper.js
index bd97a06071a..520d6c72541 100644
--- a/spec/frontend/__helpers__/mock_apollo_helper.js
+++ b/spec/frontend/__helpers__/mock_apollo_helper.js
@@ -1,5 +1,5 @@
 import { InMemoryCache } from 'apollo-cache-inmemory';
-import { createMockClient } from 'mock-apollo-client';
+import { createMockClient as createMockApolloClient } from 'mock-apollo-client';
 import VueApollo from 'vue-apollo';
 
 const defaultCacheOptions = {
@@ -7,13 +7,13 @@ const defaultCacheOptions = {
   addTypename: false,
 };
 
-export default (handlers = [], resolvers = {}, cacheOptions = {}) => {
+export function createMockClient(handlers = [], resolvers = {}, cacheOptions = {}) {
   const cache = new InMemoryCache({
     ...defaultCacheOptions,
     ...cacheOptions,
   });
 
-  const mockClient = createMockClient({ cache, resolvers });
+  const mockClient = createMockApolloClient({ cache, resolvers });
 
   if (Array.isArray(handlers)) {
     handlers.forEach(([query, value]) => mockClient.setRequestHandler(query, value));
@@ -21,7 +21,12 @@ export default (handlers = [], resolvers = {}, cacheOptions = {}) => {
     throw new Error('You should pass an array of handlers to mock Apollo client');
   }
 
+  return mockClient;
+}
+
+export default function createMockApollo(handlers, resolvers, cacheOptions) {
+  const mockClient = createMockClient(handlers, resolvers, cacheOptions);
   const apolloProvider = new VueApollo({ defaultClient: mockClient });
 
   return apolloProvider;
-};
+}