chore(deps): update dependency axios-mock-adapter to v2 (#2304)

* chore(deps): update dependency axios-mock-adapter to v2

* test: update tests for compatibility with axios-mock-adapter v2

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Braden MacDonald <[email protected]>

Author: renovate[bot]

package-lock.json

@@ -111,7 +111,7 @@
     "@types/lodash": "^4.17.17",
     "@types/react": "^18",
     "@types/react-dom": "^18",
-    "axios-mock-adapter": "1.22.0",
+    "axios-mock-adapter": "2.1.0",
     "eslint-import-resolver-webpack": "^0.13.8",
     "fetch-mock-jest": "^1.5.1",
     "jest-canvas-mock": "^2.5.2",

package.json

@@ -2380,13 +2380,10 @@ describe('<CourseOutline />', () => {
 
     // Delay to ensure we see "Please wait."
     // Without the delay the success message renders too quickly
-    const delayedResponse = axiosMock
+    axiosMock
       .onGet(exportTags(courseId))
-    // Issue with types in upstream lib, should be fixed by this PR
-    // https://github.com/ctimmerm/axios-mock-adapter/pull/391/files
-    // @ts-ignore-next-line
-      .withDelayInMs(500);
-    delayedResponse(200, expectedResponse);
+      .withDelayInMs(500)
+      .reply(200, expectedResponse);
 
     jest.mocked(useLocation).mockReturnValue({
       pathname: '/foo-bar',
@@ -2410,13 +2407,10 @@ describe('<CourseOutline />', () => {
   it('should show toast on export tags error', async () => {
     // Delay to ensure we see "Please wait."
     // Without the delay the error renders too quickly
-    const delayedResponse = axiosMock
+    axiosMock
       .onGet(exportTags(courseId))
-    // Issue with types in upstream lib, should be fixed by this PR
-    // https://github.com/ctimmerm/axios-mock-adapter/pull/391/files
-    // @ts-ignore-next-line
-      .withDelayInMs(500);
-    delayedResponse(404);
+      .withDelayInMs(500)
+      .reply(404);
 
     jest.mocked(useLocation).mockReturnValue({
       pathname: '/foo-bar',

src/course-outline/CourseOutline.test.tsx

@@ -32,6 +32,8 @@ export async function getVideos(courseId) {
 }
 
 export async function getAllUsagePaths({ courseId, videoIds }) {
+  // Hack: pass 'videoId' into the 'config' object; it will be ignored by axios
+  // but allows us to read it out later to easily get the videoId per result.
   const apiPromises = videoIds.map(id => getAuthenticatedHttpClient()
     .get(`${getVideosUrl(courseId)}/${id}/usage`, { videoId: id }));
   const updatedUsageLocations = [];

src/files-and-videos/videos-page/data/api.js

@@ -9,8 +9,8 @@ import {
 
 jest.mock('file-saver');
 
-let axiosMock;
-let axiosUnauthenticatedMock;
+let axiosMock: MockAdapter;
+let axiosUnauthenticatedMock: MockAdapter;
 
 describe('api.js', () => {
   beforeEach(() => {
@@ -85,22 +85,23 @@ describe('api.js', () => {
       expect(actual).toEqual(expected);
     });
     it('pushes an empty usageLocations field when video api call fails', async () => {
-      axiosMock.onGet(`${getVideosUrl(courseId)}/${videoIds[0]}/usage`, { videoId: videoIds[0] }).reply(404);
+      axiosMock.onGet(`${getVideosUrl(courseId)}/${videoIds[0]}/usage`)
+        .reply(404);
       const expected = [];
       const actual = await getAllUsagePaths({ courseId, videoIds });
       expect(actual).toEqual(expected);
     });
     it('sets activeStatus to active', async () => {
       const usageLocations = [{ link: '/test', name: 'test' }];
-      axiosMock.onGet(`${getVideosUrl(courseId)}/${videoIds[0]}/usage`, { videoId: videoIds[0] })
+      axiosMock.onGet(`${getVideosUrl(courseId)}/${videoIds[0]}/usage`)
         .reply(200, { usageLocations });
       const expected = [{ id: videoIds[0], usageLocations, activeStatus: 'active' }];
       const actual = await getAllUsagePaths({ courseId, videoIds });
       expect(actual).toEqual(expected);
     });
     it('sets activeStatus to inactive', async () => {
       const usageLocations = [];
-      axiosMock.onGet(`${getVideosUrl(courseId)}/${videoIds[0]}/usage`, { videoId: videoIds[0] })
+      axiosMock.onGet(`${getVideosUrl(courseId)}/${videoIds[0]}/usage`)
         .reply(200, { usageLocations });
       const expected = [{ id: videoIds[0], usageLocations, activeStatus: 'inactive' }];
       const actual = await getAllUsagePaths({ courseId, videoIds });
@@ -129,8 +130,11 @@ describe('api.js', () => {
       axiosUnauthenticatedMock.onPut(mockUrl).reply((config) => {
         const total = 1024; // mocked file size
         const progress = 0.4;
+        const loaded = total * progress;
         if (config.onUploadProgress) {
-          config.onUploadProgress({ loaded: total * progress, total });
+          config.onUploadProgress({
+            loaded, total, bytes: loaded, lengthComputable: true,
+          });
         }
         return [200, expectedResult];
       });

src/files-and-videos/videos-page/data/api.test.js renamed to src/files-and-videos/videos-page/data/api.test.ts

@@ -111,7 +111,6 @@ describe('group configurations API calls', () => {
     axiosMock
       .onDelete(
         getLegacyApiUrl(courseId, parentGroupId, groupId),
-        updatedContentGroups,
       )
       .reply(200, response);