1 files changed, 10 insertions, 35 deletions
diff --git a/spec/frontend/analytics/instance_statistics/components/users_chart_spec.js b/spec/frontend/analytics/instance_statistics/components/users_chart_spec.js
index 7509c1e6626..6ed9d203f3d 100644
--- a/spec/frontend/analytics/instance_statistics/components/users_chart_spec.js
+++ b/spec/frontend/analytics/instance_statistics/components/users_chart_spec.js
@@ -7,7 +7,12 @@ import { useFakeDate } from 'helpers/fake_date';
 import UsersChart from '~/analytics/instance_statistics/components/users_chart.vue';
 import ChartSkeletonLoader from '~/vue_shared/components/resizable_chart/skeleton_loader.vue';
 import usersQuery from '~/analytics/instance_statistics/graphql/queries/users.query.graphql';
-import { mockCountsData2, roundedSortedCountsMonthlyChartData2, mockPageInfo } from '../mock_data';
+import {
+  mockCountsData1,
+  mockCountsData2,
+  roundedSortedCountsMonthlyChartData2,
+} from '../mock_data';
+import { mockQueryResponse } from '../apollo_mock_data';
 
 const localVue = createLocalVue();
 localVue.use(VueApollo);
@@ -16,43 +21,13 @@ describe('UsersChart', () => {
   let wrapper;
   let queryHandler;
 
-  const mockApolloResponse = ({ loading = false, hasNextPage = false, users }) => ({
-    data: {
-      users: {
-        pageInfo: { ...mockPageInfo, hasNextPage },
-        nodes: users,
-        loading,
-      },
-    },
-  });
-
-  const mockQueryResponse = ({ users, loading = false, hasNextPage = false }) => {
-    const apolloQueryResponse = mockApolloResponse({ loading, hasNextPage, users });
-    if (loading) {
-      return jest.fn().mockReturnValue(new Promise(() => {}));
-    }
-    if (hasNextPage) {
-      return jest
-        .fn()
-        .mockResolvedValueOnce(apolloQueryResponse)
-        .mockResolvedValueOnce(
-          mockApolloResponse({
-            loading,
-            hasNextPage: false,
-            users: [{ recordedAt: '2020-07-21', count: 5 }],
-          }),
-        );
-    }
-    return jest.fn().mockResolvedValue(apolloQueryResponse);
-  };
-
   const createComponent = ({
     loadingError = false,
     loading = false,
     users = [],
-    hasNextPage = false,
+    additionalData = [],
   } = {}) => {
-    queryHandler = mockQueryResponse({ users, loading, hasNextPage });
+    queryHandler = mockQueryResponse({ key: 'users', data: users, loading, additionalData });
 
     return shallowMount(UsersChart, {
       props: {
@@ -157,7 +132,7 @@ describe('UsersChart', () => {
       beforeEach(async () => {
         wrapper = createComponent({
           users: mockCountsData2,
-          hasNextPage: true,
+          additionalData: mockCountsData1,
         });
 
         jest.spyOn(wrapper.vm.$apollo.queries.users, 'fetchMore');
@@ -177,7 +152,7 @@ describe('UsersChart', () => {
       beforeEach(() => {
         wrapper = createComponent({
           users: mockCountsData2,
-          hasNextPage: true,
+          additionalData: mockCountsData1,
         });
 
         jest