[test]: upgrade jest and update github action

Author: LZS911

.github/workflows/catch-and-install-pnpm.yml

@@ -0,0 +1,34 @@
+jobs:
+  catch-and-install:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - uses: pnpm/action-setup@v2
+        name: Install pnpm
+        with:
+          version: 8
+          run_install: false
+
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - uses: actions/cache@v3
+        name: Setup pnpm cache
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Install dependencies
+        run: pnpm install

.github/workflows/main.yml

@@ -8,48 +8,54 @@ on:
   workflow_dispatch:
 
 jobs:
-  cache-and-install:
+  checker:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
+      - uses: ./catch-and-install-pnpm.yml
+      - name: Code lint checker
+        run: pnpm checker
 
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16
 
-      - uses: pnpm/action-setup@v2
-        name: Install pnpm
-        with:
-          version: 8
-          run_install: false
-
-      - name: Get pnpm store directory
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+  test-ee:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[skip ci]')"
+    strategy:
+      matrix:
+        shard: [1, 2, 3, 4]     
 
-      - uses: actions/cache@v3
-        name: Setup pnpm cache
+      - uses: ./catch-and-install-pnpm.yml
+        name: Coverage test report ee
         with:
-          path: ${{ env.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-
-      - name: Install dependencies
-        run: pnpm install
+          skip-step: install
+          test-script: pnpm test:ci-ee ${{ matrix.shard }} ${{ strategy.job-total }}
+          package-manager: pnpm
 
-      - name: Code lint checker
-        run: pnpm checker
+  test-ce:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[skip ci]')"
+    steps:
+      - uses: ./catch-and-install-pnpm.yml
+      - name: Coverage test report ce
+        with:
+          skip-step: install
+          test-script: pnpm test:ci-ce
+          package-manager: pnpm
 
+  report:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[skip ci]')"
+    steps:
       - uses: ArtiomTr/jest-coverage-report-action@v2
-        name: Coverage test report
+      - name: Coverage test report
         with:
           skip-step: install
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          test-script: pnpm test:ci
+          test-script: node ./scripts/jest/merge-report-json.js
           package-manager: pnpm
+
+
+
+
+

.gitignore

@@ -13,10 +13,8 @@ dist
 **/dist/*
 
 # testing
-/ee_coverage
 /ce_coverage
 /coverage
-/packages/*/coverage
 /report.json
 
 # production

package.json

@@ -20,22 +20,22 @@
     "checker": "pnpm ts-check && pnpm eslint && pnpm stylelint && pnpm prettier:c",
     "test": "sh ./scripts/jest/run.sh",
     "test:c": "sh ./scripts/jest/run-coverage.sh",
-    "test:ci": "sh ./scripts/jest/run-ci.sh",
+    "test:ci": "sh ./scripts/jest/run-ci-ee.sh && sh ./scripts/jest/run-ce-ce.sh && node ./scripts/jest/merge-report-json.js",
     "test:clean": "jest --clearCache",
-    "test:merge": "istanbul-merge --out report.json ce_coverage/report.json coverage/report.json"
+    "test:merge": "nyc merge coverage/ report.json"
   },
   "keywords": [],
   "author": "",
   "devDependencies": {
     "@cfaester/enzyme-adapter-react-18": "^0.7.0",
     "@stylelint/postcss-css-in-js": "^0.38.0",
-    "@testing-library/dom": "^9.2.0",
-    "@testing-library/jest-dom": "^5.16.5",
-    "@testing-library/react": "^13.3.0",
+    "@testing-library/dom": "9.3.4",
+    "@testing-library/jest-dom": "6.4.2",
+    "@testing-library/react": "14.2.1",
     "@testing-library/react-hooks": "^8.0.1",
     "@testing-library/user-event": "^14.4.3",
     "@types/enzyme": "^3.10.8",
-    "@types/jest": "27.5.1",
+    "@types/jest": "29.5.12",
     "@types/json2md": "^1.5.1",
     "@types/lodash": "^4.14.182",
     "@types/node": "^18.0.4",
@@ -48,6 +48,7 @@
     "@typescript-eslint/parser": "^5.30.6",
     "@vitejs/plugin-react": "^2.1.0",
     "babel-jest": "^29.7.0",
+    "babel-preset-react-app": "^10.0.1",
     "comment-parser": "^1.4.1",
     "cross-env": "^7.0.3",
     "enzyme": "^3.11.0",
@@ -58,13 +59,15 @@
     "eslint-plugin-prettier": "^4.2.1",
     "identity-obj-proxy": "^3.0.0",
     "istanbul-merge": "^2.0.0",
-    "jest": "27.5.1",
-    "jest-environment-jsdom": "27.5.1",
+    "jest": "29.1.2",
+    "jest-canvas-mock": "^2.2.0",
+    "jest-environment-jsdom": "29.7.0",
     "jest-slow-test-reporter": "^1.0.0",
     "jest-watch-typeahead": "^2.1.1",
     "less": "^4.1.3",
     "mockdate": "^3.0.5",
     "msw": "^0.45.0",
+    "nyc": "^15.1.0",
     "postcss-less": "^6.0.0",
     "prettier": "^2.7.1",
     "stylelint": "^15.10.2",

packages/base/src/hooks/useDbService/__snapshots__/index.test.tsx.snap

@@ -1,18 +1,18 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`useDbService should render options when use generateDbServiceIDSelectOptions 1`] = `
-Array [
-  Object {
+[
+  {
     "label": <DatabaseTypeLogo
       dbType="MySQL"
       logoUrl=""
     />,
-    "options": Array [
-      Object {
+    "options": [
+      {
         "label": "test (127.0.0.1:3306)",
         "value": "123123",
       },
-      Object {
+      {
         "label": "test2 (localhost:3306)",
         "value": "300123",
       },
@@ -277,18 +277,18 @@ exports[`useDbService should render options when use generateDbServiceIDSelectOp
 `;
 
 exports[`useDbService should render options when use generateDbServiceSelectOptions 1`] = `
-Array [
-  Object {
+[
+  {
     "label": <DatabaseTypeLogo
       dbType="MySQL"
       logoUrl=""
     />,
-    "options": Array [
-      Object {
+    "options": [
+      {
         "label": "test (127.0.0.1:3306)",
         "value": "test",
       },
-      Object {
+      {
         "label": "test2 (localhost:3306)",
         "value": "test2",
       },

packages/base/src/hooks/useDbService/index.test.tsx

@@ -41,8 +41,8 @@ describe('useDbService', () => {
           ListDBServiceTipsFunctionalModuleEnum.create_export_task
       })
     );
-    expect(listDbServicesSpy).toBeCalled();
-    expect(listDbServicesSpy).toBeCalledWith({
+    expect(listDbServicesSpy).toHaveBeenCalled();
+    expect(listDbServicesSpy).toHaveBeenCalledWith({
       functional_module:
         ListDBServiceTipsFunctionalModuleEnum.create_export_task,
       project_uid: projectID

packages/base/src/hooks/useSqlReviewTemplateToggle/index.test.tsx

@@ -44,14 +44,14 @@ describe('test base/hooks/useSqlReviewTemplateToggle', () => {
     await act(() => {
       result.current.changeAuditRequired(false);
     });
-    expect(mockSetFieldsForm).not.toBeCalled();
+    expect(mockSetFieldsForm).not.toHaveBeenCalled();
 
     await act(() => {
       result.current.changeAuditRequired(true);
     });
 
-    expect(mockSetFieldsForm).toBeCalledTimes(1);
-    expect(mockSetFieldsForm).toBeCalledWith({
+    expect(mockSetFieldsForm).toHaveBeenCalledTimes(1);
+    expect(mockSetFieldsForm).toHaveBeenCalledWith({
       needSqlAuditService: true
     });
   });
@@ -62,9 +62,9 @@ describe('test base/hooks/useSqlReviewTemplateToggle', () => {
     await act(() => {
       result.current.clearRuleTemplate();
     });
-    expect(mockSetFieldsForm).toBeCalledTimes(1);
+    expect(mockSetFieldsForm).toHaveBeenCalledTimes(1);
 
-    expect(mockSetFieldsForm).toBeCalledWith({
+    expect(mockSetFieldsForm).toHaveBeenCalledWith({
       needSqlAuditService: false,
       ruleTemplateId: undefined,
       ruleTemplateName: undefined

packages/base/src/hooks/useSystemConfig/index.test.tsx

@@ -76,7 +76,7 @@ describe('test base/hooks/useSystemConfig', () => {
       `/logo_custom.png?temp=${dayjs('2023-12-18 12:00:00').valueOf()}`
     );
 
-    expect(scopeDispatch).toBeCalledTimes(1);
+    expect(scopeDispatch).toHaveBeenCalledTimes(1);
     expect(scopeDispatch).nthCalledWith(1, {
       payload: {
         webLogoUrl: `/logo_custom.png?temp=${dayjs(
@@ -94,7 +94,7 @@ describe('test base/hooks/useSystemConfig', () => {
     expect(document.title).toBe(DMS_DEFAULT_WEB_TITLE);
     expect(mockedElement.href).toBe(DMS_DEFAULT_WEB_LOGO_URL);
 
-    expect(scopeDispatch).toBeCalledTimes(2);
+    expect(scopeDispatch).toHaveBeenCalledTimes(2);
     expect(scopeDispatch).nthCalledWith(2, {
       payload: {
         webLogoUrl: DMS_DEFAULT_WEB_LOGO_URL,

packages/base/src/hooks/useTaskSource/index.test.tsx

@@ -41,13 +41,13 @@ describe('useTaskSource', () => {
     });
 
     expect(result.current.loading).toBe(true);
-    expect(requestSpy).toBeCalledTimes(1);
+    expect(requestSpy).toHaveBeenCalledTimes(1);
     expect(result.current.taskSourceList).toEqual([]);
 
     await act(async () => jest.advanceTimersByTime(3000));
 
     expect(result.current.loading).toBe(false);
-    expect(requestSpy).toBeCalledTimes(1);
+    expect(requestSpy).toHaveBeenCalledTimes(1);
     expect(result.current.taskSourceList).toEqual(taskListTips);
     cleanup();
 
@@ -77,13 +77,13 @@ describe('useTaskSource', () => {
     });
 
     expect(result.current.loading).toBe(true);
-    expect(requestSpy).toBeCalledTimes(1);
+    expect(requestSpy).toHaveBeenCalledTimes(1);
     expect(result.current.taskSourceList).toEqual([]);
 
     await act(async () => jest.advanceTimersByTime(3000));
 
     expect(result.current.loading).toBe(false);
-    expect(requestSpy).toBeCalledTimes(1);
+    expect(requestSpy).toHaveBeenCalledTimes(1);
     expect(result.current.taskSourceList).toEqual([
       { source: 'source1', db_types: ['mysql'] },
       { source: 'source2', db_types: ['oracle'] }
@@ -100,7 +100,7 @@ describe('useTaskSource', () => {
       result.current.updateTaskSourceList();
     });
     expect(result.current.loading).toBe(true);
-    expect(requestSpy).toBeCalledTimes(1);
+    expect(requestSpy).toHaveBeenCalledTimes(1);
     expect(result.current.taskSourceList).toEqual([
       { source: 'source1', db_types: ['mysql'] },
       { source: 'source2', db_types: ['oracle'] }
@@ -109,7 +109,7 @@ describe('useTaskSource', () => {
     await act(async () => jest.advanceTimersByTime(3000));
 
     expect(result.current.loading).toBe(false);
-    expect(requestSpy).toBeCalledTimes(1);
+    expect(requestSpy).toHaveBeenCalledTimes(1);
     expect(result.current.taskSourceList).toEqual([]);
   });
 
@@ -123,13 +123,13 @@ describe('useTaskSource', () => {
     });
 
     expect(result.current.loading).toBe(true);
-    expect(requestSpy).toBeCalledTimes(1);
+    expect(requestSpy).toHaveBeenCalledTimes(1);
     expect(result.current.taskSourceList).toEqual([]);
 
     await act(async () => jest.advanceTimersByTime(3000));
 
     expect(result.current.loading).toBe(false);
-    expect(requestSpy).toBeCalledTimes(1);
+    expect(requestSpy).toHaveBeenCalledTimes(1);
     expect(result.current.taskSourceList).toEqual([
       { source: 'source1', db_types: ['mysql'] },
       { source: 'source2', db_types: ['oracle'] }
@@ -146,7 +146,7 @@ describe('useTaskSource', () => {
       result.current.updateTaskSourceList();
     });
     expect(result.current.loading).toBe(true);
-    expect(requestSpy).toBeCalledTimes(1);
+    expect(requestSpy).toHaveBeenCalledTimes(1);
     expect(result.current.taskSourceList).toEqual([
       { source: 'source1', db_types: ['mysql'] },
       { source: 'source2', db_types: ['oracle'] }
@@ -155,7 +155,7 @@ describe('useTaskSource', () => {
     await act(async () => jest.advanceTimersByTime(3000));
 
     expect(result.current.loading).toBe(false);
-    expect(requestSpy).toBeCalledTimes(1);
+    expect(requestSpy).toHaveBeenCalledTimes(1);
     expect(result.current.taskSourceList).toEqual([]);
   });