1 files changed, 39 insertions, 27 deletions

diff --git a/spec/frontend/import_projects/store/actions_spec.js b/spec/frontend/import_projects/store/actions_spec.js
index 45a59b3f6d6..6951f2bf04d 100644
--- a/spec/frontend/import_projects/store/actions_spec.js
+++ b/spec/frontend/import_projects/store/actions_spec.js
@@ -83,7 +83,7 @@ describe('import_projects store actions', () => {
 
     afterEach(() => mock.restore());
 
-    it('dispatches stopJobsPolling actions and commits REQUEST_REPOS, RECEIVE_REPOS_SUCCESS mutations on a successful request', () => {
+    it('commits SET_PAGE, REQUEST_REPOS, RECEIVE_REPOS_SUCCESS mutations on a successful request', () => {
       mock.onGet(MOCK_ENDPOINT).reply(200, payload);
 
       return testAction(
@@ -91,54 +91,65 @@ describe('import_projects store actions', () => {
         null,
         localState,
         [
+          { type: SET_PAGE, payload: 1 },
           { type: REQUEST_REPOS },
           {
             type: RECEIVE_REPOS_SUCCESS,
             payload: convertObjectPropsToCamelCase(payload, { deep: true }),
           },
         ],
-        [{ type: 'stopJobsPolling' }, { type: 'fetchJobs' }],
+        [],
       );
     });
 
-    it('dispatches stopJobsPolling action and commits REQUEST_REPOS, RECEIVE_REPOS_ERROR mutations on an unsuccessful request', () => {
+    it('commits SET_PAGE, REQUEST_REPOS, RECEIVE_REPOS_ERROR and SET_PAGE again mutations on an unsuccessful request', () => {
       mock.onGet(MOCK_ENDPOINT).reply(500);
 
       return testAction(
         fetchRepos,
         null,
         localState,
-        [{ type: REQUEST_REPOS }, { type: RECEIVE_REPOS_ERROR }],
-        [{ type: 'stopJobsPolling' }],
+        [
+          { type: SET_PAGE, payload: 1 },
+          { type: REQUEST_REPOS },
+          { type: SET_PAGE, payload: 0 },
+          { type: RECEIVE_REPOS_ERROR },
+        ],
+        [],
       );
     });
 
-    describe('when pagination is enabled', () => {
-      it('includes page in url query params', async () => {
-        const { fetchRepos: fetchReposWithPagination } = actionsFactory({
-          endpoints,
-          hasPagination: true,
-        });
+    it('includes page in url query params', async () => {
+      let requestedUrl;
+      mock.onGet().reply(config => {
+        requestedUrl = config.url;
+        return [200, payload];
+      });
 
-        let requestedUrl;
-        mock.onGet().reply(config => {
-          requestedUrl = config.url;
-          return [200, payload];
-        });
+      const localStateWithPage = { ...localState, pageInfo: { page: 2 } };
 
-        await testAction(
-          fetchReposWithPagination,
-          null,
-          localState,
-          expect.any(Array),
-          expect.any(Array),
-        );
+      await testAction(fetchRepos, null, localStateWithPage, expect.any(Array), expect.any(Array));
 
-        expect(requestedUrl).toBe(`${MOCK_ENDPOINT}?page=${localState.pageInfo.page}`);
-      });
+      expect(requestedUrl).toBe(`${MOCK_ENDPOINT}?page=${localStateWithPage.pageInfo.page + 1}`);
     });
 
-    describe('when filtered', () => {
+    it('correctly updates current page on an unsuccessful request', () => {
+      mock.onGet(MOCK_ENDPOINT).reply(500);
+      const CURRENT_PAGE = 5;
+
+      return testAction(
+        fetchRepos,
+        null,
+        { ...localState, pageInfo: { page: CURRENT_PAGE } },
+        expect.arrayContaining([
+          { type: SET_PAGE, payload: CURRENT_PAGE + 1 },
+          { type: SET_PAGE, payload: CURRENT_PAGE },
+        ]),
+        [],
+      );
+    });
+
+    describe('when /home/xanf/projects/gdk/gitlab/spec/frontend/import_projects/store/actions_spec.jsfiltered', () => {
       it('fetches repos with filter applied', () => {
         mock.onGet(`${TEST_HOST}/endpoint.json?filter=filter`).reply(200, payload);
 
@@ -147,13 +158,14 @@ describe('import_projects store actions', () => {
           null,
           { ...localState, filter: 'filter' },
           [
+            { type: SET_PAGE, payload: 1 },
             { type: REQUEST_REPOS },
             {
               type: RECEIVE_REPOS_SUCCESS,
               payload: convertObjectPropsToCamelCase(payload, { deep: true }),
             },
           ],
-          [{ type: 'stopJobsPolling' }, { type: 'fetchJobs' }],
+          [],
         );
       });
     });