Merge pull request #4659 from dlabrecq/deps2

Dependency updates

Author: dlabrecq

apps/koku-ui-hccm/jest.config.js

@@ -4,6 +4,20 @@ const baseConfig = require('../../jest.config.base');
 module.exports = {
   ...baseConfig,
   roots: ['<rootDir>/src'],
-  setupFiles: ['<rootDir>/test/testEnv.ts'],
+  setupFiles: ['<rootDir>/test/testEnv.js'],
   setupFilesAfterEnv: ['<rootDir>/test/jest.setup.js'],
+  // Ensure no experimental SWC plugins break setup files
+  transform: {
+    '^.+\\.svg$': 'jest-transform-stub',
+    '^.+\\.(ts|js)x?$': [
+      '@swc/jest',
+      {
+        $schema: 'http://json.schemastore.org/swcrc',
+        jsc: {
+          parser: { jsx: true, syntax: 'typescript', tsx: true },
+          transform: { react: { runtime: 'automatic' } },
+        },
+      },
+    ],
+  },
 };

apps/koku-ui-hccm/package.json

@@ -58,8 +58,8 @@
     "@patternfly/react-icons": "6.4.0",
     "@patternfly/react-table": "6.4.0",
     "@patternfly/react-tokens": "6.4.0",
-    "@redhat-cloud-services/frontend-components": "^7.0.12",
-    "@redhat-cloud-services/frontend-components-notifications": "^6.1.13",
+    "@redhat-cloud-services/frontend-components": "^7.0.13",
+    "@redhat-cloud-services/frontend-components-notifications": "^6.1.14",
     "@redhat-cloud-services/frontend-components-translations": "^4.0.16",
     "@redhat-cloud-services/frontend-components-utilities": "^7.0.9",
     "@redhat-cloud-services/rbac-client": "^4.2.5",

apps/koku-ui-hccm/src/api/export/exportUtils.test.ts

@@ -1,9 +1,13 @@
+jest.mock('./exportUtils', () => ({
+  __esModule: true,
+  runExport: jest.fn(),
+}));
 import { waitFor } from '@testing-library/react';
 import { ReportPathsType, ReportType } from 'api/reports/report';
 
 import * as exportUtils from './exportUtils';
 
-jest.spyOn(exportUtils, 'runExport');
+// runExport is a mocked function via jest.mock above
 
 test('runExport API request for AWS', async () => {
   exportUtils.runExport(ReportPathsType.aws, ReportType.cost, '');

apps/koku-ui-hccm/src/api/forecasts/forecastUtils.test.ts

@@ -1,9 +1,13 @@
+jest.mock('./forecastUtils', () => ({
+  __esModule: true,
+  runForecast: jest.fn(),
+}));
 import { waitFor } from '@testing-library/react';
 
 import { ForecastPathsType, ForecastType } from './forecast';
 import * as forecastUtils from './forecastUtils';
 
-jest.spyOn(forecastUtils, 'runForecast');
+// runForecast is a mocked function via jest.mock above
 
 test('runForecast API request for AWS', async () => {
   forecastUtils.runForecast(ForecastPathsType.aws, ForecastType.cost, '');

apps/koku-ui-hccm/src/api/reports/reportUtils.test.ts

@@ -1,9 +1,13 @@
+jest.mock('./reportUtils', () => ({
+  __esModule: true,
+  runReport: jest.fn(),
+}));
 import { waitFor } from '@testing-library/react';
 
 import { ReportPathsType, ReportType } from './report';
 import * as reportUtils from './reportUtils';
 
-jest.spyOn(reportUtils, 'runReport');
+// runReport is a mocked function via jest.mock above
 
 test('runReport API request for AWS', async () => {
   reportUtils.runReport(ReportPathsType.aws, ReportType.cost, '');

apps/koku-ui-hccm/src/api/resources/resourceUtils.test.ts

@@ -1,10 +1,14 @@
+jest.mock('./resourceUtils', () => ({
+  __esModule: true,
+  isResourceTypeValid: jest.fn(() => true),
+  runResource: jest.fn(),
+}));
 import { waitFor } from '@testing-library/react';
 
 import { ResourcePathsType, ResourceType } from './resource';
 import * as resourceUtils from './resourceUtils';
 
-jest.spyOn(resourceUtils, 'isResourceTypeValid');
-jest.spyOn(resourceUtils, 'runResource');
+// isResourceTypeValid and runResource are mocked via jest.mock above
 
 test('runResource API request for AWS', async () => {
   resourceUtils.runResource(ResourcePathsType.aws, ResourceType.account, '');

apps/koku-ui-hccm/src/api/tags/tagUtils.test.ts

@@ -1,9 +1,13 @@
+jest.mock('./tagUtils', () => ({
+  __esModule: true,
+  runTag: jest.fn(),
+}));
 import { waitFor } from '@testing-library/react';
 
 import { TagPathsType, TagType } from './tag';
 import * as tagUtils from './tagUtils';
 
-jest.spyOn(tagUtils, 'runTag');
+// runTag is a mocked function via jest.mock above
 
 test('runTag API request for AWS', async () => {
   tagUtils.runTag(TagPathsType.aws, TagType.tag, '');

apps/koku-ui-hccm/src/store/accountSettings/accountSettings.test.ts

@@ -30,8 +30,6 @@ const accountSettingsMock: AccountSettings = {
 
 fetchAccountSettingsMock.mockReturnValue(Promise.resolve({ data: accountSettingsMock }));
 
-jest.spyOn(selectors, 'selectAccountSettingsStatus');
-
 test('default state', async () => {
   const store = createProdvidersStore();
   expect(selectors.selectAccountSettingsState(store.getState())).toMatchSnapshot();
@@ -44,7 +42,11 @@ test('fetch account settings success', async () => {
   expect(selectors.selectAccountSettingsStatus(store.getState(), AccountSettingsType.settings)).toBe(
     FetchStatus.inProgress
   );
-  await waitFor(() => expect(selectors.selectAccountSettingsStatus).toHaveBeenCalled());
+  await waitFor(() =>
+    expect(selectors.selectAccountSettingsStatus(store.getState(), AccountSettingsType.settings)).toBe(
+      FetchStatus.complete
+    )
+  );
   const finishedState = store.getState();
   expect(selectors.selectAccountSettingsStatus(finishedState, AccountSettingsType.settings)).toBe(FetchStatus.complete);
 });
@@ -58,7 +60,11 @@ test('fetch account settings failure', async () => {
   expect(selectors.selectAccountSettingsStatus(store.getState(), AccountSettingsType.settings)).toBe(
     FetchStatus.inProgress
   );
-  await waitFor(() => expect(selectors.selectAccountSettingsStatus).toHaveBeenCalled());
+  await waitFor(() =>
+    expect(selectors.selectAccountSettingsStatus(store.getState(), AccountSettingsType.settings)).toBe(
+      FetchStatus.complete
+    )
+  );
   const finishedState = store.getState();
   expect(selectors.selectAccountSettingsStatus(finishedState, AccountSettingsType.settings)).toBe(FetchStatus.complete);
 });

apps/koku-ui-hccm/src/store/costModels/store.test.ts

@@ -50,9 +50,7 @@ const createCostModelsStore = createMockStoreCreator({
   [stateKey]: costModelsReducer,
 });
 
-jest.spyOn(actions, 'deleteCostModel');
-jest.spyOn(actions, 'updateCostModel');
-jest.spyOn(selectors, 'status');
+// Avoid spying on ESM exports; assert via selectors and state
 
 test('default state', async () => {
   const store = createCostModelsStore();
@@ -97,7 +95,7 @@ test('fetching cost models succeeded', async () => {
   expect(selectors.error(store.getState())).toEqual(null);
   store.dispatch(actions.fetchCostModels());
   expect(selectors.status(store.getState())).toBe(FetchStatus.inProgress);
-  await waitFor(() => expect(selectors.status).toHaveBeenCalled());
+  await waitFor(() => expect(selectors.status(store.getState())).toBe(FetchStatus.complete));
   expect(selectors.costModels(store.getState())).toEqual([costmodel1]);
   expect(selectors.error(store.getState())).toEqual(null);
   expect(selectors.status(store.getState())).toBe(FetchStatus.complete);
@@ -115,7 +113,7 @@ test('fetching cost models failed', async () => {
   expect(selectors.error(store.getState())).toEqual(null);
   store.dispatch(actions.fetchCostModels());
   expect(selectors.status(store.getState())).toBe(FetchStatus.inProgress);
-  await waitFor(() => expect(selectors.status).toHaveBeenCalled());
+  await waitFor(() => expect(selectors.status(store.getState())).toBe(FetchStatus.complete));
   expect(selectors.costModels(store.getState())).toEqual([]);
   expect(selectors.error(store.getState())).toEqual(error);
   expect(selectors.status(store.getState())).toBe(FetchStatus.complete);
@@ -149,7 +147,7 @@ test('updating a cost model succeeded', async () => {
   expect(selectors.updateError(store.getState())).toBe('');
   store.dispatch(actions.updateCostModel());
   expect(selectors.updateProcessing(store.getState())).toBe(true);
-  await waitFor(() => expect(actions.updateCostModel).toHaveBeenCalled());
+  await waitFor(() => expect(selectors.updateProcessing(store.getState())).toBe(false));
   expect(selectors.selected(store.getState())).toEqual(updated_costmodel1);
   expect(selectors.updateError(store.getState())).toEqual('');
   expect(selectors.updateProcessing(store.getState())).toBe(false);
@@ -164,7 +162,7 @@ test('updating a cost model failed', async () => {
   expect(selectors.updateProcessing(store.getState())).toBe(false);
   store.dispatch(actions.updateCostModel());
   expect(selectors.updateProcessing(store.getState())).toBe(true);
-  await waitFor(() => expect(actions.updateCostModel).toHaveBeenCalled());
+  await waitFor(() => expect(selectors.updateProcessing(store.getState())).toBe(false));
   expect(selectors.selected(store.getState())).toEqual(costmodel1);
   expect(selectors.updateError(store.getState())).toEqual('oops');
   expect(selectors.updateProcessing(store.getState())).toBe(false);
@@ -179,7 +177,7 @@ test('deleting a cost model succeeded', async () => {
   store.dispatch(actions.deleteCostModel('11123', 'deleteCostModel'));
   expect(selectors.deleteProcessing(store.getState())).toBe(true);
   expect(selectors.isDialogOpen(store.getState())('costmodel').deleteCostModel).toBe(true);
-  await waitFor(() => expect(actions.deleteCostModel).toHaveBeenCalled());
+  await waitFor(() => expect(selectors.deleteProcessing(store.getState())).toBe(false));
   expect(selectors.deleteError(store.getState())).toEqual('');
   expect(selectors.deleteProcessing(store.getState())).toBe(false);
   expect(selectors.isDialogOpen(store.getState())('costmodel').deleteCostModel).toBe(false);
@@ -194,7 +192,7 @@ test('deleting a cost model failed', async () => {
   expect(selectors.deleteProcessing(store.getState())).toBe(false);
   store.dispatch(actions.deleteCostModel('111', 'deleteCostModel'));
   expect(selectors.deleteProcessing(store.getState())).toBe(true);
-  await waitFor(() => expect(actions.deleteCostModel).toHaveBeenCalled());
+  await waitFor(() => expect(selectors.deleteProcessing(store.getState())).toBe(false));
   expect(selectors.deleteError(store.getState())).toEqual('oops');
   expect(selectors.deleteProcessing(store.getState())).toBe(false);
   expect(selectors.isDialogOpen(store.getState())('costmodel').deleteCostModel).toBe(true);

apps/koku-ui-hccm/src/store/export/export.test.ts

@@ -33,9 +33,6 @@ const reportQueryString = 'reportQueryString';
 runExportMock.mockResolvedValue({ data: mockExport });
 global.Date.now = jest.fn(() => 12345);
 
-jest.spyOn(actions, 'fetchExport');
-jest.spyOn(selectors, 'selectExportFetchStatus');
-
 test('default state', () => {
   const store = createExportsStore();
   expect(selectors.selectExportState(store.getState())).toMatchSnapshot();
@@ -48,7 +45,11 @@ test('fetch export success', async () => {
   expect(selectors.selectExportFetchStatus(store.getState(), reportPathsType, reportType, reportQueryString)).toBe(
     FetchStatus.inProgress
   );
-  await waitFor(() => expect(selectors.selectExportFetchStatus).toHaveBeenCalled());
+  await waitFor(() =>
+    expect(selectors.selectExportFetchStatus(store.getState(), reportPathsType, reportType, reportQueryString)).toBe(
+      FetchStatus.complete
+    )
+  );
   const finishedState = store.getState();
   expect(selectors.selectExportFetchStatus(finishedState, reportPathsType, reportType, reportQueryString)).toBe(
     FetchStatus.complete
@@ -65,7 +66,11 @@ test('fetch export failure', async () => {
   expect(selectors.selectExportFetchStatus(store.getState(), reportPathsType, reportType, reportQueryString)).toBe(
     FetchStatus.inProgress
   );
-  await waitFor(() => expect(selectors.selectExportFetchStatus).toHaveBeenCalled());
+  await waitFor(() =>
+    expect(selectors.selectExportFetchStatus(store.getState(), reportPathsType, reportType, reportQueryString)).toBe(
+      FetchStatus.complete
+    )
+  );
   const finishedState = store.getState();
   expect(selectors.selectExportFetchStatus(finishedState, reportPathsType, reportType, reportQueryString)).toBe(
     FetchStatus.complete
@@ -83,7 +88,11 @@ test('does not export if the request is in progress', () => {
 test('export is not re-exported if it has not expired', async () => {
   const store = createExportsStore();
   store.dispatch(actions.fetchExport(reportPathsType, reportType, reportQueryString));
-  await waitFor(() => expect(actions.fetchExport).toHaveBeenCalled());
+  await waitFor(() =>
+    expect(selectors.selectExportFetchStatus(store.getState(), reportPathsType, reportType, reportQueryString)).toBe(
+      FetchStatus.complete
+    )
+  );
   store.dispatch(actions.fetchExport(reportPathsType, reportType, reportQueryString));
   expect(runExport).toHaveBeenCalledTimes(1);
 });