Merge pull request #182 from LabKey/fb_merge_23.7_to_develop

Merge discvr-23.7 to develop

Author: bbimber

mcc/jest.config.js

@@ -0,0 +1,26 @@
+module.exports = {
+    globals: {
+        LABKEY: {},
+    },
+    moduleFileExtensions: ['ts', 'tsx', 'js'],
+    moduleNameMapper: {
+        '\\.(css)$': '<rootDir>/src/client/test/styleMock.ts',
+    },
+    roots: ['<rootDir>'],
+    setupFilesAfterEnv: [
+        './src/client/test/jest.setup.ts'
+    ],
+    testEnvironment: 'jsdom',
+    testPathIgnorePatterns: [
+        '/node_modules/'
+    ],
+    testRegex: '(\\.(spec))\\.(ts|tsx)$',
+    transform: {
+        '^.+\\.tsx?$': [
+            'ts-jest',
+            {
+                tsconfig: 'node_modules/@labkey/build/webpack/tsconfig.json',
+            }
+        ],
+    },
+};

mcc/package-lock.json

@@ -27,43 +27,24 @@
     "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@labkey/build": "^6.14.0",
+    "@labkey/build": "^6.15.0",
     "@types/chart.js": "^2.9.37",
     "@types/jest": "^29.0.0",
     "@types/jexl": "^2.3.1",
     "@types/jquery": "^3.0.0",
     "@types/node": "^18.17.1",
+    "@types/react": "^17.0.68",
+    "@types/react-dom": "^17.0.21",
     "@types/tsv": "^0.2.1",
     "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
+    "canvas": "^2.11.2",
     "enzyme": "^3.11.0",
     "jest": "^29.0.0",
     "jest-canvas-mock": "^2.5.2",
     "jest-cli": "^29.0.0",
+    "jest-environment-jsdom": "^29.7.0",
     "jest-mock": "^29.0.0",
-    "jsdom-global": "^3.0.2",
     "rimraf": "^3.0.2",
     "ts-jest": "^29.0.0"
-  },
-  "jest": {
-    "globals": {
-      "ts-jest": {
-        "tsconfig": "node_modules/@labkey/build/webpack/tsconfig.json"
-      },
-      "LABKEY": {}
-    },
-    "moduleFileExtensions": [
-      "ts",
-      "tsx",
-      "js"
-    ],
-    "setupFilesAfterEnv": [
-      "<rootDir>/test/jest.setup.ts"
-    ],
-    "moduleNameMapper": {
-      "\\.(css)$": "<rootDir>/test/styleMock.ts"
-    },
-    "transform": {
-      "^.+\\.tsx?$": "ts-jest"
-    }
   }
 }

mcc/package.json

@@ -1,8 +1,7 @@
-import 'jsdom-global/register'
 import React from 'react';
 import { mount, shallow } from 'enzyme';
 import { mocked } from 'jest-mock';
-import { jest, describe, expect, test, beforeEach } from '@jest/globals';
+import { describe, expect, jest, test } from '@jest/globals';
 
 import { Chart } from 'chart.js';
 import BarChart from './BarChart';

mcc/src/client/Dashboard/BarChart.spec.tsx

@@ -1,4 +1,3 @@
-import 'jsdom-global/register';
 import React from 'react';
 import { mount } from 'enzyme';
 import { mocked } from 'jest-mock';

mcc/src/client/Dashboard/Dashboard.spec.tsx

@@ -1,4 +1,3 @@
-import 'jsdom-global/register';
 import React from 'react';
 import { mount, shallow } from 'enzyme';
 import { mocked } from 'jest-mock';

mcc/src/client/Dashboard/PieChart.spec.tsx

@@ -0,0 +1,4 @@
+import { configure } from 'enzyme';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
+
+configure({ adapter: new Adapter() });

mcc/src/client/test/jest.setup.ts

@@ -0,0 +1,4 @@
+{
+  "extends": "./node_modules/@labkey/build/webpack/tsconfig.json"
+}
+