Merge pull request #5341 from learningequality/dependabot/npm_and_yarn/jest-1ecd9637f0

chore(deps-dev): bump the jest group across 1 directory with 4 updates

Author: rtibbles

contentcuration/contentcuration/frontend/accounts/pages/AccountsMain.vue

@@ -129,6 +129,7 @@
   import PolicyModals from 'shared/views/policies/PolicyModals';
   import { policies } from 'shared/constants';
   import LanguageSwitcherList from 'shared/languageSwitcher/LanguageSwitcherList';
+  import { redirectBrowser } from 'shared/utils/navigation';
 
   export default {
     name: 'AccountsMain',
@@ -176,7 +177,7 @@
             .then(() => {
               this.loginFailedOffline = false;
               this.loginFailed = false;
-              window.location.assign(this.nextParam || window.Urls.channels());
+              redirectBrowser(this.nextParam || window.Urls.channels());
             })
             .catch(err => {
               this.busy = false;

contentcuration/contentcuration/frontend/accounts/pages/__tests__/accountsMain.spec.js

@@ -2,13 +2,16 @@ import { render, screen, waitFor } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
 import VueRouter from 'vue-router';
 import AccountsMain from '../AccountsMain.vue';
+import { redirectBrowser } from 'shared/utils/navigation';
+
+jest.mock('shared/utils/navigation', () => ({
+  redirectBrowser: jest.fn(),
+}));
 
 window.Urls = {
   channels: () => '/channels/',
 };
 
-const originalLocation = window.location;
-
 const createRouter = () => {
   return new VueRouter({
     mode: 'abstract',
@@ -28,12 +31,9 @@ const createRouter = () => {
 function makeWrapper({ loginMock = jest.fn(), online = true, nextParam = null } = {}) {
   const router = createRouter();
 
-  delete window.location;
-  window.location = {
-    ...originalLocation,
-    search: nextParam ? `?next=${nextParam}` : '',
-    assign: jest.fn(),
-  };
+  // Use pushState to set search params without triggering jsdom navigation
+  const url = nextParam ? `http://studio.time/?next=${nextParam}` : 'http://studio.time/';
+  window.history.pushState({}, '', url);
 
   return {
     ...render(AccountsMain, {
@@ -64,7 +64,8 @@ describe('AccountsMain', () => {
   });
 
   afterEach(() => {
-    window.location = originalLocation;
+    jest.clearAllMocks();
+    window.history.pushState({}, '', 'http://studio.time/');
   });
 
   it('should render sign-in form with email, password fields and sign in button', () => {
@@ -112,7 +113,7 @@ describe('AccountsMain', () => {
 
     // User is redirected to channels page
     await waitFor(() => {
-      expect(window.location.assign).toHaveBeenCalledWith('/channels/');
+      expect(redirectBrowser).toHaveBeenCalledWith('/channels/');
     });
   });
 
@@ -133,7 +134,7 @@ describe('AccountsMain', () => {
 
     // User is redirected to next URL
     await waitFor(() => {
-      expect(window.location.assign).toHaveBeenCalledWith(nextUrl);
+      expect(redirectBrowser).toHaveBeenCalledWith(nextUrl);
     });
   });
 

contentcuration/contentcuration/frontend/channelEdit/components/AssessmentEditor/AssessmentEditor.spec.js

@@ -270,7 +270,7 @@ describe('AssessmentEditor', () => {
 
     it('emits delete item event with a correct key', () => {
       expect(listeners.deleteItem).toHaveBeenCalledWith(ITEM2);
-      expect(listeners.updateItems).toBeCalledTimes(1);
+      expect(listeners.updateItems).toHaveBeenCalledTimes(1);
     });
 
     it('emits update item events with updated order of items after the deleted item', () => {
@@ -288,7 +288,7 @@ describe('AssessmentEditor', () => {
           order: 2,
         },
       ]);
-      expect(listeners.updateItems).toBeCalledTimes(1);
+      expect(listeners.updateItems).toHaveBeenCalledTimes(1);
     });
   });
 
@@ -300,7 +300,7 @@ describe('AssessmentEditor', () => {
     });
 
     it('emits add item event with a new item with a correct order', () => {
-      expect(listeners.addItem).toBeCalledWith({
+      expect(listeners.addItem).toHaveBeenCalledWith({
         contentnode: NODE_ID,
         question: '',
         type: AssessmentItemTypes.SINGLE_SELECTION,
@@ -330,7 +330,7 @@ describe('AssessmentEditor', () => {
           order: 4,
         },
       ]);
-      expect(listeners.updateItems).toBeCalledTimes(1);
+      expect(listeners.updateItems).toHaveBeenCalledTimes(1);
     });
   });
 
@@ -351,7 +351,7 @@ describe('AssessmentEditor', () => {
         order: 2,
         [DELAYED_VALIDATION]: true,
       });
-      expect(listeners.addItem).toBeCalledTimes(1);
+      expect(listeners.addItem).toHaveBeenCalledTimes(1);
     });
 
     it('emits update item events with updated order of items below the new item', () => {
@@ -373,7 +373,7 @@ describe('AssessmentEditor', () => {
           order: 4,
         },
       ]);
-      expect(listeners.updateItems).toBeCalledTimes(1);
+      expect(listeners.updateItems).toHaveBeenCalledTimes(1);
     });
   });
 
@@ -395,7 +395,7 @@ describe('AssessmentEditor', () => {
           order: 1,
         },
       ]);
-      expect(listeners.updateItems).toBeCalledTimes(1);
+      expect(listeners.updateItems).toHaveBeenCalledTimes(1);
     });
   });
 
@@ -417,7 +417,7 @@ describe('AssessmentEditor', () => {
           order: 1,
         },
       ]);
-      expect(listeners.updateItems).toBeCalledTimes(1);
+      expect(listeners.updateItems).toHaveBeenCalledTimes(1);
     });
   });
 
@@ -427,7 +427,7 @@ describe('AssessmentEditor', () => {
     });
 
     it('emits add item event with a new item with a correct order', () => {
-      expect(listeners.addItem).toBeCalledWith({
+      expect(listeners.addItem).toHaveBeenCalledWith({
         contentnode: NODE_ID,
         question: '',
         type: AssessmentItemTypes.SINGLE_SELECTION,

contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogList.vue

@@ -185,6 +185,7 @@
   import ChannelStar from './ChannelStar';
   import ChannelTokenModal from 'shared/views/channel/ChannelTokenModal';
   import Pagination from 'shared/views/Pagination';
+  import { redirectBrowser } from 'shared/utils/navigation';
   import BottomBar from 'shared/views/BottomBar';
   import ToolBar from 'shared/views/ToolBar';
   import OfflineText from 'shared/views/OfflineText';
@@ -366,7 +367,7 @@
       },
       onCardClick(channel) {
         if (this.loggedIn) {
-          window.location.assign(window.Urls.channel(channel.id));
+          redirectBrowser(window.Urls.channel(channel.id));
         } else {
           this.$router.push(this.getChannelDetailsRoute(channel));
         }

contentcuration/contentcuration/frontend/channelList/views/Channel/StudioMyChannels/__tests__/StudioMyChannels.spec.js

@@ -4,8 +4,11 @@ import VueRouter from 'vue-router';
 import { Store } from 'vuex';
 import StudioMyChannels from '../index.vue';
 import { ChannelListTypes } from 'shared/constants';
+import { redirectBrowser } from 'shared/utils/navigation';
 
-const originalLocation = window.location;
+jest.mock('shared/utils/navigation', () => ({
+  redirectBrowser: jest.fn(),
+}));
 
 const router = new VueRouter({
   routes: [
@@ -104,7 +107,7 @@ describe('StudioMyChannels', () => {
   });
 
   afterEach(() => {
-    window.location = originalLocation;
+    jest.restoreAllMocks();
   });
 
   it('calls the load channel list action with correct parameters on mount', () => {
@@ -152,14 +155,11 @@ describe('StudioMyChannels', () => {
   });
 
   it('navigates to channel via window.location when card clicked', async () => {
-    delete window.location;
-    window.location = { ...originalLocation, assign: jest.fn() };
-
     renderComponent();
     const cards = await screen.findAllByTestId('channel-card');
     await userEvent.click(cards[0]);
 
-    expect(window.location.assign).toHaveBeenCalledWith('channel');
+    expect(redirectBrowser).toHaveBeenCalledWith('channel');
   });
 
   describe('cards footer actions', () => {

contentcuration/contentcuration/frontend/channelList/views/Channel/StudioMyChannels/index.vue

@@ -84,6 +84,7 @@
   import DeleteChannelModal from '../DeleteChannelModal';
   import ChannelTokenModal from 'shared/views/channel/ChannelTokenModal';
   import { ChannelListTypes } from 'shared/constants';
+  import { redirectBrowser } from 'shared/utils/navigation';
 
   export default {
     name: 'StudioMyChannels',
@@ -138,7 +139,7 @@
         });
       },
       onCardClick(channel) {
-        window.location.assign(window.Urls.channel(channel.id));
+        redirectBrowser(window.Urls.channel(channel.id));
       },
       getDropdownItems(channel) {
         const items = [

contentcuration/contentcuration/frontend/channelList/views/Channel/StudioStarredChannels/__tests__/StudioStarredChannels.spec.js

@@ -4,8 +4,11 @@ import VueRouter from 'vue-router';
 import { Store } from 'vuex';
 import StudioStarredChannels from '../index';
 import { ChannelListTypes } from 'shared/constants';
+import { redirectBrowser } from 'shared/utils/navigation';
 
-const originalLocation = window.location;
+jest.mock('shared/utils/navigation', () => ({
+  redirectBrowser: jest.fn(),
+}));
 
 const router = new VueRouter({
   routes: [
@@ -94,7 +97,7 @@ describe('StudioStarredChannels', () => {
   });
 
   afterEach(() => {
-    window.location = originalLocation;
+    jest.restoreAllMocks();
   });
 
   it('calls the load channel list action with correct parameters on mount', () => {
@@ -121,14 +124,11 @@ describe('StudioStarredChannels', () => {
   });
 
   it('navigates to channel via window.location when card clicked', async () => {
-    delete window.location;
-    window.location = { ...originalLocation, assign: jest.fn() };
-
     renderComponent();
     const cards = await screen.findAllByTestId('channel-card');
     await userEvent.click(cards[0]);
 
-    expect(window.location.assign).toHaveBeenCalledWith('channel');
+    expect(redirectBrowser).toHaveBeenCalledWith('channel');
   });
 
   describe('cards footer actions', () => {

contentcuration/contentcuration/frontend/channelList/views/Channel/StudioStarredChannels/index.vue

@@ -76,6 +76,7 @@
   import RemoveChannelFromListModal from '../RemoveChannelFromListModal';
   import ChannelTokenModal from 'shared/views/channel/ChannelTokenModal';
   import { ChannelListTypes } from 'shared/constants';
+  import { redirectBrowser } from 'shared/utils/navigation';
 
   export default {
     name: 'StudioStarredChannels',
@@ -117,7 +118,7 @@
         if (!val) this.tokenChannelId = null;
       },
       onCardClick(channel) {
-        window.location.assign(window.Urls.channel(channel.id));
+        redirectBrowser(window.Urls.channel(channel.id));
       },
       getDropdownItems(channel) {
         const items = [];

contentcuration/contentcuration/frontend/channelList/views/Channel/StudioViewOnlyChannels/__tests__/StudioViewOnlyChannels.spec.js

@@ -4,8 +4,11 @@ import VueRouter from 'vue-router';
 import { Store } from 'vuex';
 import StudioViewOnlyChannels from '../index';
 import { ChannelListTypes } from 'shared/constants';
+import { redirectBrowser } from 'shared/utils/navigation';
 
-const originalLocation = window.location;
+jest.mock('shared/utils/navigation', () => ({
+  redirectBrowser: jest.fn(),
+}));
 
 const router = new VueRouter({
   routes: [
@@ -103,7 +106,7 @@ describe('StudioViewOnlyChannels', () => {
   });
 
   afterEach(() => {
-    window.location = originalLocation;
+    jest.restoreAllMocks();
   });
 
   it('calls the load channel list action with correct parameters on mount', () => {
@@ -135,14 +138,11 @@ describe('StudioViewOnlyChannels', () => {
   });
 
   it('navigates to channel via window.location when card clicked', async () => {
-    delete window.location;
-    window.location = { ...originalLocation, assign: jest.fn() };
-
     renderComponent();
     const cards = await screen.findAllByTestId('channel-card');
     await userEvent.click(cards[0]);
 
-    expect(window.location.assign).toHaveBeenCalledWith('channel');
+    expect(redirectBrowser).toHaveBeenCalledWith('channel');
   });
 
   describe('cards footer actions', () => {

contentcuration/contentcuration/frontend/channelList/views/Channel/StudioViewOnlyChannels/index.vue

@@ -73,6 +73,7 @@
   import RemoveChannelFromListModal from '../RemoveChannelFromListModal';
   import ChannelTokenModal from 'shared/views/channel/ChannelTokenModal';
   import { ChannelListTypes } from 'shared/constants';
+  import { redirectBrowser } from 'shared/utils/navigation';
 
   export default {
     name: 'StudioViewOnlyChannels',
@@ -120,7 +121,7 @@
         if (!val) this.tokenChannelId = null;
       },
       onCardClick(channel) {
-        window.location.assign(window.Urls.channel(channel.id));
+        redirectBrowser(window.Urls.channel(channel.id));
       },
       getDropdownItems(channel) {
         const items = [{ label: this.$tr('removeChannel'), icon: 'trash', value: 'remove' }];