Merge branch 'master' into issue/4047

mochajs · Mar 26, 2024 · 21e566d · 21e566d
2 parents bad240d + 7ac67f3
commit 21e566d
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'weekly'
+    groups:
+      github-actions:
+        patterns:
+          - '*'
diff --git a/.github/workflows/browser-test.yml b/.github/workflows/browser-test.yml
@@ -20,7 +20,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
           persist-credentials: false
       - name: 'Cache node_modules'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: '~/.npm'
           key: "ubuntu-latest-node-full-lts-${{ hashFiles('**/package-lock.json') }}"
@@ -32,7 +32,7 @@ jobs:
           SAUCE_USERNAME: '${{secrets.SAUCE_USERNAME}}'
           SAUCE_ACCESS_KEY: '${{secrets.SAUCE_ACCESS_KEY}}'
       - name: remove 'run-browser-test' label
-        uses: buildsville/[email protected].0
+        uses: buildsville/[email protected].1
         if: ${{ always() }}
         with:
           token: ${{secrets.GITHUB_TOKEN}}

diff --git a/.github/workflows/mocha.yml b/.github/workflows/mocha.yml
@@ -70,7 +70,7 @@ jobs:
         with:
           persist-credentials: false
       - name: 'Cache node_modules'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: '~/.npm'
           key: "ubuntu-latest-node-lts-${{ hashFiles('**/package-lock.json') }}"
@@ -113,7 +113,7 @@ jobs:
         run: |
           echo "dir=$(npm config get cache)" >> $env:GITHUB_OUTPUT
       - name: 'Cache node_modules'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ matrix.os == 'ubuntu-latest' && '~/.npm' || steps.npm-cache.outputs.dir }}
           key: "${{ matrix.os }}-node-v${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }}"
@@ -152,7 +152,7 @@ jobs:
         with:
           persist-credentials: false
       - name: 'Cache node_modules'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: '~/.npm'
           # this key is different than above, since we are running scripts
@@ -189,7 +189,7 @@ jobs:
         with:
           persist-credentials: false
       - name: 'Cache node_modules'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: '~/.npm'
           # this key is different than above, since we are running scripts

diff --git a/lib/cli/run.js b/lib/cli/run.js
@@ -369,7 +369,7 @@ exports.handler = async function (argv) {
   try {
     await runMocha(mocha, argv);
   } catch (err) {
-    console.error('\n' + (err.stack || `Error: ${err.message || err}`));
+    console.error('\n Exception during run:', err);
     process.exit(1);
   }
 };
diff --git a/test/integration/reporters.spec.js b/test/integration/reporters.spec.js
@@ -44,8 +44,8 @@ describe('reporters', function () {
         'output=' + tmpFile
       ];
       var expectedOutput = [
-        '<testcase classname="suite" name="test1" time="',
-        '<testcase classname="suite" name="test2" time="',
+        '<testcase classname="suite" name="test1" file="',
+        '<testcase classname="suite" name="test2" file="',
         '</testsuite>'
       ];
 
@@ -211,7 +211,7 @@ describe('reporters', function () {
             return;
           }
 
-          var pattern = `^Error: invalid or unsupported TAP version: "${invalidTapVersion}"`;
+          var pattern = `Error: invalid or unsupported TAP version: "${invalidTapVersion}"`;
           expect(res, 'to satisfy', {
             code: 1,
             output: new RegExp(pattern, 'm')