Merge branch 'main' into pr-179

dorny · Nov 30, 2022 · b45fb8b · b45fb8b
2 parents 8b0cebb + 396026f
commit b45fb8b
Show file tree

Hide file tree

Showing 47 changed files with 34,004 additions and 27,907 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,3 +1,4 @@
 dist/
 lib/
-node_modules/
+node_modules/
+jest.config.js
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,57 +1,89 @@
 {
-    "plugins": ["jest", "@typescript-eslint"],
-    "extends": ["plugin:github/recommended"],
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-      "ecmaVersion": 9,
-      "sourceType": "module",
-      "project": "./tsconfig.json"
+  "plugins": ["import", "jest", "@typescript-eslint"],
+  "extends": ["plugin:github/recommended"],
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "ecmaVersion": 9,
+    "sourceType": "module",
+    "project": "./tsconfig.json"
+  },
+  "rules": {
+    "i18n-text/no-en": "off",
+    "eslint-comments/no-use": "off",
+    "import/no-namespace": "off",
+    "no-shadow": "off",
+    "no-unused-vars": "off",
+    "prefer-template": "off",
+    "@typescript-eslint/no-unused-vars": ["error", {"varsIgnorePattern": "^_"}],
+    "@typescript-eslint/explicit-member-accessibility": ["error", {"accessibility": "no-public"}],
+    "@typescript-eslint/no-require-imports": "error",
+    "@typescript-eslint/array-type": "error",
+    "@typescript-eslint/await-thenable": "error",
+    "@typescript-eslint/ban-ts-comment": "error",
+    "camelcase": "off",
+    "@typescript-eslint/consistent-type-assertions": "error",
+    "@typescript-eslint/explicit-function-return-type": ["error", {"allowExpressions": true}],
+    "@typescript-eslint/func-call-spacing": ["error", "never"],
+    "@typescript-eslint/no-array-constructor": "error",
+    "@typescript-eslint/no-empty-interface": "error",
+    "@typescript-eslint/no-explicit-any": "error",
+    "@typescript-eslint/no-extraneous-class": "error",
+    "@typescript-eslint/no-for-in-array": "error",
+    "@typescript-eslint/no-inferrable-types": "error",
+    "@typescript-eslint/no-misused-new": "error",
+    "@typescript-eslint/no-namespace": "error",
+    "@typescript-eslint/no-non-null-assertion": "warn",
+    "@typescript-eslint/no-unnecessary-qualifier": "error",
+    "@typescript-eslint/no-unnecessary-type-assertion": "error",
+    "@typescript-eslint/no-useless-constructor": "error",
+    "@typescript-eslint/no-var-requires": "error",
+    "@typescript-eslint/prefer-for-of": "warn",
+    "@typescript-eslint/prefer-function-type": "warn",
+    "@typescript-eslint/prefer-includes": "error",
+    "@typescript-eslint/prefer-string-starts-ends-with": "error",
+    "@typescript-eslint/promise-function-async": "error",
+    "@typescript-eslint/require-array-sort-compare": "error",
+    "@typescript-eslint/restrict-plus-operands": "error",
+    "semi": "off",
+    "@typescript-eslint/semi": ["error", "never"],
+    "@typescript-eslint/type-annotation-spacing": "error",
+    "@typescript-eslint/unbound-method": "error"
+  },
+  "env": {
+    "node": true,
+    "es6": true,
+    "jest/globals": true
+  },
+  "settings": {
+    "import/parsers": {
+      "@typescript-eslint/parser": [".ts", ".tsx"]
     },
-    "rules": {
-      "camelcase": "off",
-      "eslint-comments/no-use": "off",
-      "import/no-namespace": "off",
-      "no-shadow": "off",
-      "no-unused-vars": "off",
-      "prefer-template": "off",
-      "semi": [ "error", "never"],
-      "@typescript-eslint/explicit-member-accessibility": ["error", {"accessibility": "no-public"}],
-      "@typescript-eslint/array-type": "error",
-      "@typescript-eslint/await-thenable": "error",
-      "@typescript-eslint/ban-ts-comment": "error",
-      "@typescript-eslint/consistent-type-assertions": "error",
-      "@typescript-eslint/explicit-function-return-type": ["error", {"allowExpressions": true}],
-      "@typescript-eslint/func-call-spacing": ["error", "never"],
-      "@typescript-eslint/no-array-constructor": "error",
-      "@typescript-eslint/no-empty-interface": "error",
-      "@typescript-eslint/no-explicit-any": "error",
-      "@typescript-eslint/no-extraneous-class": "error",
-      "@typescript-eslint/no-for-in-array": "error",
-      "@typescript-eslint/no-inferrable-types": "error",
-      "@typescript-eslint/no-misused-new": "error",
-      "@typescript-eslint/no-namespace": "error",
-      "@typescript-eslint/no-require-imports": "error",
-      "@typescript-eslint/no-shadow": "error",
-      "@typescript-eslint/no-non-null-assertion": "warn",
-      "@typescript-eslint/no-unnecessary-qualifier": "error",
-      "@typescript-eslint/no-unnecessary-type-assertion": "error",
-      "@typescript-eslint/no-unused-vars": ["error", {"varsIgnorePattern": "^_"}],
-      "@typescript-eslint/no-useless-constructor": "error",
-      "@typescript-eslint/no-var-requires": "error",
-      "@typescript-eslint/prefer-for-of": "warn",
-      "@typescript-eslint/prefer-function-type": "warn",
-      "@typescript-eslint/prefer-includes": "error",
-      "@typescript-eslint/prefer-string-starts-ends-with": "error",
-      "@typescript-eslint/promise-function-async": "error",
-      "@typescript-eslint/require-array-sort-compare": "error",
-      "@typescript-eslint/restrict-plus-operands": "error",
-      "@typescript-eslint/semi": ["error", "never"],
-      "@typescript-eslint/type-annotation-spacing": "error",
-      "@typescript-eslint/unbound-method": "error"
-    },
-    "env": {
-      "node": true,
-      "es6": true,
-      "jest/globals": true
+    "import/resolver": {
+      "typescript": {
+        "alwaysTryTypes": true, // always try to resolve types under `<root>@types` directory even it doesn't contain any source code, like `@types/unist`
+
+        // Choose from one of the "project" configs below or omit to use <root>/tsconfig.json by default
+
+        // use <root>/path/to/folder/tsconfig.json
+        "project": "path/to/folder",
+
+        // Multiple tsconfigs (Useful for monorepos)
+
+        // use a glob pattern
+        "project": "packages/*/tsconfig.json",
+
+        // use an array
+        "project": [
+          "packages/module-a/tsconfig.json",
+          "packages/module-b/tsconfig.json"
+        ],
+
+        // use an array of glob patterns
+        "project": [
+          "packages/*/tsconfig.json",
+          "other-packages/*/tsconfig.json"
+        ]
+      }
     }
   }
+}
diff --git a/.github/workflows/check-dist.yml b/.github/workflows/check-dist.yml
@@ -0,0 +1,53 @@
+# `dist/index.js` is a special file in Actions.
+# When you reference an action with `uses:` in a workflow,
+# `index.js` is the code that will run.
+# For our project, we generate this file through a build process from other source files.
+# We need to make sure the checked-in `index.js` actually matches what we expect it to be.
+name: Check dist/
+
+on:
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - '**.md'
+  pull_request:
+    paths-ignore:
+      - '**.md'
+  workflow_dispatch:
+
+jobs:
+  check-dist:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set Node.js 16.x
+        uses: actions/setup-node@v3.5.1
+        with:
+          node-version: 16.x
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Rebuild the dist/ directory
+        run: |
+          npm run build
+          npm run package
+
+      - name: Compare the expected and actual dist/ directories
+        run: |
+          if [ "$(git diff --ignore-space-at-eol dist/ | wc -l)" -gt "0" ]; then
+            echo "Detected uncommitted changes after build.  See status below:"
+            git diff
+            exit 1
+          fi
+        id: diff
+
+      # If index.js was different than expected, upload the expected version as an artifact
+      - uses: actions/upload-artifact@v2
+        if: ${{ failure() && steps.diff.conclusion == 'failure' }}
+        with:
+          name: dist
+          path: dist/
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,6 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - run: node --version
       - run: npm ci
       - run: npm run build
       - run: npm run format-check
@@ -26,11 +27,3 @@ jobs:
         with:
           name: test-results
           path: __tests__/__results__/*.xml
-
-      - name: Create test report
-        uses: ./
-        if: success() || failure()
-        with:
-          name: JEST Tests
-          path: __tests__/__results__/*.xml
-          reporter: jest-junit
diff --git a/.github/workflows/manual-run.yml b/.github/workflows/manual-run.yml
@@ -0,0 +1,22 @@
+name: Manual run
+
+on:
+  workflow_dispatch:
+
+jobs:
+  check-dist:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - run: npm ci
+      - run: npm run build
+      - run: npm test
+
+      - name: Create test report
+        uses: ./
+        if: success() || failure()
+        with:
+          name: JEST Tests
+          path: __tests__/__results__/*.xml
+          reporter: jest-junit
diff --git a/.gitignore b/.gitignore
@@ -100,3 +100,5 @@ lib/**/*
 
 # Project specific
 __tests__/__results__
+
+.idea
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v18.7.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.6.0
+- [Update to node16 + recent versions of core and exec packages](https://github.com/dorny/test-reporter/pull/203)
+- [Update all dependencies to latest versions](https://github.com/dorny/test-reporter/pull/186)
+- [Fix tests on non us-EN local env](https://github.com/dorny/test-reporter/pull/185)
+
 ## v1.5.0
 - [Add option to convert backslashes in path pattern to forward slashes](https://github.com/dorny/test-reporter/pull/128)
 - [Add option to generate only the summary from processed test results files](https://github.com/dorny/test-reporter/pull/123)

diff --git a/README.md b/README.md
@@ -58,6 +58,8 @@ To workaround this security restriction, it's required to use two separate workf
 1. `CI` runs in the context of the PR head branch with the read-only token. It executes the tests and uploads test results as a build artifact
 2. `Test Report` runs in the context of the repository main branch with read/write token. It will download test results and create reports
 
+The second workflow will only run after it has been merged into your default branch (typically `main` or `master`), it won't run in a PR unless after the workflow file is part of that branch.
+
 **PR head branch:**  *.github/workflows/ci.yml*
 ```yaml
 name: 'CI'

diff --git a/__tests__/__outputs__/dart-json.md b/__tests__/__outputs__/dart-json.md
@@ -3,12 +3,12 @@
 **6** tests were completed in **4s** with **1** passed, **4** failed and **1** skipped.
 |Test suite|Passed|Failed|Skipped|Time|
 |:---|---:|---:|---:|---:|
-|[test/main_test.dart](#r0s0)|1✔️|3❌||74ms|
-|[test/second_test.dart](#r0s1)||1❌|1✖️|51ms|
+|[test/main_test.dart](#r0s0)|1✅|3❌||74ms|
+|[test/second_test.dart](#r0s1)||1❌|1⚪|51ms|
 ### ❌ <a id="user-content-r0s0" href="#r0s0">test/main_test.dart</a>
 ```
 Test 1
-  ✔️ Passing test
+  ✅ Passing test
 Test 1 Test 1.1
   ❌ Failing test
 	Expected: <2>
@@ -24,5 +24,5 @@ Test 2
 ```
 ❌ Timeout test
 	TimeoutException after 0:00:00.000001: Test timed out after 0 seconds.
-✖️ Skipped test
+⚪ Skipped test
 ```
diff --git a/__tests__/__outputs__/dotnet-trx.md b/__tests__/__outputs__/dotnet-trx.md
@@ -3,10 +3,10 @@
 **11** tests were completed in **1s** with **5** passed, **5** failed and **1** skipped.
 |Test suite|Passed|Failed|Skipped|Time|
 |:---|---:|---:|---:|---:|
-|[DotnetTests.XUnitTests.CalculatorTests](#r0s0)|5✔️|5❌|1✖️|118ms|
+|[DotnetTests.XUnitTests.CalculatorTests](#r0s0)|5✅|5❌|1⚪|118ms|
 ### ❌ <a id="user-content-r0s0" href="#r0s0">DotnetTests.XUnitTests.CalculatorTests</a>
 ```
-✔️ Custom Name
+✅ Custom Name
 ❌ Exception_In_TargetTest
 	System.DivideByZeroException : Attempted to divide by zero.
 ❌ Exception_In_Test
@@ -15,17 +15,17 @@
 	Assert.Equal() Failure
 	Expected: 3
 	Actual:   2
-✔️ Is_Even_Number(i: 2)
+✅ Is_Even_Number(i: 2)
 ❌ Is_Even_Number(i: 3)
 	Assert.True() Failure
 	Expected: True
 	Actual:   False
-✔️ Passing_Test
-✔️ Should be even number(i: 2)
+✅ Passing_Test
+✅ Should be even number(i: 2)
 ❌ Should be even number(i: 3)
 	Assert.True() Failure
 	Expected: True
 	Actual:   False
-✖️ Skipped_Test
-✔️ Timeout_Test
+⚪ Skipped_Test
+✅ Timeout_Test
 ```