Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

2 files changed, 41 insertions, 3 deletions

diff --git a/spec/frontend/api/groups_api_spec.js b/spec/frontend/api/groups_api_spec.js
index e14ead0b8eb..9de588a02aa 100644
--- a/spec/frontend/api/groups_api_spec.js
+++ b/spec/frontend/api/groups_api_spec.js
@@ -1,10 +1,13 @@
 import MockAdapter from 'axios-mock-adapter';
+import getGroupTransferLocationsResponse from 'test_fixtures/api/groups/transfer_locations.json';
 import httpStatus from '~/lib/utils/http_status';
 import axios from '~/lib/utils/axios_utils';
-import { updateGroup } from '~/api/groups_api';
+import { DEFAULT_PER_PAGE } from '~/api';
+import { updateGroup, getGroupTransferLocations } from '~/api/groups_api';
 
 const mockApiVersion = 'v4';
 const mockUrlRoot = '/gitlab';
+const mockGroupId = '99';
 
 describe('GroupsApi', () => {
   let originalGon;
@@ -27,7 +30,6 @@ describe('GroupsApi', () => {
   });
 
   describe('updateGroup', () => {
-    const mockGroupId = '99';
     const mockData = { attr: 'value' };
     const expectedUrl = `${mockUrlRoot}/api/${mockApiVersion}/groups/${mockGroupId}`;
 
@@ -43,4 +45,25 @@ describe('GroupsApi', () => {
       expect(res.data).toMatchObject({ id: mockGroupId, ...mockData });
     });
   });
+
+  describe('getGroupTransferLocations', () => {
+    beforeEach(() => {
+      jest.spyOn(axios, 'get');
+    });
+
+    it('retrieves transfer locations from the correct URL and returns them in the response data', async () => {
+      const params = { page: 1 };
+      const expectedUrl = `${mockUrlRoot}/api/${mockApiVersion}/groups/${mockGroupId}/transfer_locations`;
+
+      mock.onGet(expectedUrl).replyOnce(200, { data: getGroupTransferLocationsResponse });
+
+      await expect(getGroupTransferLocations(mockGroupId, params)).resolves.toMatchObject({
+        data: { data: getGroupTransferLocationsResponse },
+      });
+
+      expect(axios.get).toHaveBeenCalledWith(expectedUrl, {
+        params: { ...params, per_page: DEFAULT_PER_PAGE },
+      });
+    });
+  });
 });
diff --git a/spec/frontend/api/user_api_spec.js b/spec/frontend/api/user_api_spec.js
index ee7194bdf5f..ba6b73e8c1a 100644
--- a/spec/frontend/api/user_api_spec.js
+++ b/spec/frontend/api/user_api_spec.js
@@ -1,7 +1,8 @@
 import MockAdapter from 'axios-mock-adapter';
 
-import { followUser, unfollowUser } from '~/api/user_api';
+import { followUser, unfollowUser, associationsCount } from '~/api/user_api';
 import axios from '~/lib/utils/axios_utils';
+import { associationsCount as associationsCountData } from 'jest/admin/users/mock_data';
 
 describe('~/api/user_api', () => {
   let axiosMock;
@@ -47,4 +48,18 @@ describe('~/api/user_api', () => {
       expect(axiosMock.history.post[0].url).toBe(expectedUrl);
     });
   });
+
+  describe('associationsCount', () => {
+    it('calls correct URL and returns expected response', async () => {
+      const expectedUrl = '/api/v4/users/1/associations_count';
+      const expectedResponse = { data: associationsCountData };
+
+      axiosMock.onGet(expectedUrl).replyOnce(200, expectedResponse);
+
+      await expect(associationsCount(1)).resolves.toEqual(
+        expect.objectContaining({ data: expectedResponse }),
+      );
+      expect(axiosMock.history.get[0].url).toBe(expectedUrl);
+    });
+  });
 });