2 files changed, 63 insertions, 12 deletions

diff --git a/spec/frontend/groups/components/app_spec.js b/spec/frontend/groups/components/app_spec.js
index b474745790e..e32c50db8bf 100644
--- a/spec/frontend/groups/components/app_spec.js
+++ b/spec/frontend/groups/components/app_spec.js
@@ -93,10 +93,9 @@ describe('AppComponent', () => {
             page: 2,
             filterGroupsBy: 'git',
             sortBy: 'created_desc',
-            archived: true,
           })
           .then(() => {
-            expect(getGroupsSpy).toHaveBeenCalledWith(1, 2, 'git', 'created_desc', true);
+            expect(getGroupsSpy).toHaveBeenCalledWith(1, 2, 'git', 'created_desc');
           });
       });
 
@@ -154,7 +153,6 @@ describe('AppComponent', () => {
           filterGroupsBy: 'foobar',
           sortBy: null,
           updatePagination: true,
-          archived: null,
         });
         return fetchPromise.then(() => {
           expect(vm.updateGroups).toHaveBeenCalledWith(mockSearchedGroups, true);
@@ -177,7 +175,6 @@ describe('AppComponent', () => {
           page: 2,
           filterGroupsBy: null,
           sortBy: null,
-          archived: true,
         });
 
         expect(vm.isLoading).toBe(true);
@@ -186,7 +183,6 @@ describe('AppComponent', () => {
           filterGroupsBy: null,
           sortBy: null,
           updatePagination: true,
-          archived: true,
         });
 
         return fetchPagePromise.then(() => {
@@ -471,7 +467,7 @@ describe('AppComponent', () => {
     it('calls API with expected params', () => {
       emitFetchFilteredAndSortedGroups();
 
-      expect(getGroupsSpy).toHaveBeenCalledWith(undefined, undefined, search, sort, undefined);
+      expect(getGroupsSpy).toHaveBeenCalledWith(undefined, undefined, search, sort);
     });
 
     it('updates pagination', () => {
diff --git a/spec/frontend/groups/components/overview_tabs_spec.js b/spec/frontend/groups/components/overview_tabs_spec.js
index ca852f398d0..8db69295ac4 100644
--- a/spec/frontend/groups/components/overview_tabs_spec.js
+++ b/spec/frontend/groups/components/overview_tabs_spec.js
@@ -10,26 +10,29 @@ import SharedProjectsEmptyState from '~/groups/components/empty_states/shared_pr
 import ArchivedProjectsEmptyState from '~/groups/components/empty_states/archived_projects_empty_state.vue';
 import GroupsStore from '~/groups/store/groups_store';
 import GroupsService from '~/groups/service/groups_service';
+import ArchivedProjectsService from '~/groups/service/archived_projects_service';
 import { createRouter } from '~/groups/init_overview_tabs';
 import eventHub from '~/groups/event_hub';
 import {
   ACTIVE_TAB_SUBGROUPS_AND_PROJECTS,
   ACTIVE_TAB_SHARED,
   ACTIVE_TAB_ARCHIVED,
-  OVERVIEW_TABS_SORTING_ITEMS,
+  SORTING_ITEM_NAME,
+  SORTING_ITEM_UPDATED,
+  SORTING_ITEM_STARS,
 } from '~/groups/constants';
 import axios from '~/lib/utils/axios_utils';
 import waitForPromises from 'helpers/wait_for_promises';
 
 Vue.component('GroupFolder', GroupFolderComponent);
 const router = createRouter();
-const [SORTING_ITEM_NAME, , SORTING_ITEM_UPDATED] = OVERVIEW_TABS_SORTING_ITEMS;
 
 describe('OverviewTabs', () => {
   let wrapper;
   let axiosMock;
 
   const defaultProvide = {
+    groupId: '1',
     endpoints: {
       subgroups_and_projects: '/groups/foobar/-/children.json',
       shared: '/groups/foobar/-/shared_projects.json',
@@ -92,7 +95,10 @@ describe('OverviewTabs', () => {
     expect(tabPanel.findComponent(GroupsApp).props()).toMatchObject({
       action: ACTIVE_TAB_SUBGROUPS_AND_PROJECTS,
       store: new GroupsStore({ showSchemaMarkup: true }),
-      service: new GroupsService(defaultProvide.endpoints[ACTIVE_TAB_SUBGROUPS_AND_PROJECTS]),
+      service: new GroupsService(
+        defaultProvide.endpoints[ACTIVE_TAB_SUBGROUPS_AND_PROJECTS],
+        defaultProvide.initialSort,
+      ),
     });
 
     await waitForPromises();
@@ -115,7 +121,10 @@ describe('OverviewTabs', () => {
     expect(tabPanel.findComponent(GroupsApp).props()).toMatchObject({
       action: ACTIVE_TAB_SHARED,
       store: new GroupsStore(),
-      service: new GroupsService(defaultProvide.endpoints[ACTIVE_TAB_SHARED]),
+      service: new GroupsService(
+        defaultProvide.endpoints[ACTIVE_TAB_SHARED],
+        defaultProvide.initialSort,
+      ),
     });
 
     expect(tabPanel.vm.$attrs.lazy).toBe(false);
@@ -140,7 +149,7 @@ describe('OverviewTabs', () => {
     expect(tabPanel.findComponent(GroupsApp).props()).toMatchObject({
       action: ACTIVE_TAB_ARCHIVED,
       store: new GroupsStore(),
-      service: new GroupsService(defaultProvide.endpoints[ACTIVE_TAB_ARCHIVED]),
+      service: new ArchivedProjectsService(defaultProvide.groupId, defaultProvide.initialSort),
     });
 
     expect(tabPanel.vm.$attrs.lazy).toBe(false);
@@ -219,7 +228,7 @@ describe('OverviewTabs', () => {
     it(`pushes expected route when ${tabToClick} tab is clicked`, async () => {
       await findTab(tabToClick).trigger('click');
 
-      expect(routerMock.push).toHaveBeenCalledWith(expectedRoute);
+      expect(routerMock.push).toHaveBeenCalledWith(expect.objectContaining(expectedRoute));
     });
   });
 
@@ -304,6 +313,52 @@ describe('OverviewTabs', () => {
       sharedAssertions({ search: '', sort: SORTING_ITEM_UPDATED.asc });
     });
 
+    describe('when tab is changed', () => {
+      describe('when selected sort is supported', () => {
+        beforeEach(async () => {
+          await createComponent({
+            route: {
+              name: ACTIVE_TAB_SUBGROUPS_AND_PROJECTS,
+              params: { group: 'foo/bar/baz' },
+              query: { sort: SORTING_ITEM_NAME.asc },
+            },
+          });
+        });
+
+        it('adds sort query string', async () => {
+          await findTab(OverviewTabs.i18n[ACTIVE_TAB_ARCHIVED]).trigger('click');
+
+          expect(routerMock.push).toHaveBeenCalledWith(
+            expect.objectContaining({
+              query: { sort: SORTING_ITEM_NAME.asc },
+            }),
+          );
+        });
+      });
+
+      describe('when selected sort is not supported', () => {
+        beforeEach(async () => {
+          await createComponent({
+            route: {
+              name: ACTIVE_TAB_SUBGROUPS_AND_PROJECTS,
+              params: { group: 'foo/bar/baz' },
+              query: { sort: SORTING_ITEM_STARS.asc },
+            },
+          });
+        });
+
+        it('defaults to sorting by name', async () => {
+          await findTab(OverviewTabs.i18n[ACTIVE_TAB_ARCHIVED]).trigger('click');
+
+          expect(routerMock.push).toHaveBeenCalledWith(
+            expect.objectContaining({
+              query: { sort: SORTING_ITEM_NAME.asc },
+            }),
+          );
+        });
+      });
+    });
+
     describe('when sort direction is changed', () => {
       beforeEach(async () => {
         await setup();