Merge branch 'main' into dependabot/npm_and_yarn/braces-3.0.3

americanexpress · Jan 9, 2025 · 8f1a436 · 8f1a436
2 parents f64192e + ff77394
commit 8f1a436
Show file tree

Hide file tree

Showing 10 changed files with 10,993 additions and 10,682 deletions.
diff --git a/.github/workflows/health-check.yml b/.github/workflows/health-check.yml
@@ -9,7 +9,7 @@ jobs:
   tests:
     strategy:
       matrix:
-        node: [ '14.x', '16.x', '18.x' ]
+        node: [ '18.x', '20.x', '22.x' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
     runs-on: ${{ matrix.os }}
     name: Node ${{ matrix.node }} - ${{ matrix.os }}

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -9,7 +9,7 @@ jobs:
   tests:
     strategy:
       matrix:
-        node: [ '14.x', '16.x', '18.x' ]
+        node: [ '18.x', '20.x', '22.x' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
     runs-on: ${{ matrix.os }}
     name: Node ${{ matrix.node }} - ${{ matrix.os }}

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-14
+20
diff --git a/__tests__/__image_snapshots__/cleanup-required-7.png b/__tests__/__image_snapshots__/cleanup-required-7.png
diff --git a/...image-snapshot-failures-writes-a-result-image-for-failing-tests-ssim-3-snap.png b/...image-snapshot-failures-writes-a-result-image-for-failing-tests-ssim-3-snap.png
diff --git a/__tests__/integration.spec.js b/__tests__/integration.spec.js
@@ -14,7 +14,7 @@
 
 const fs = require('fs');
 const path = require('path');
-const rimraf = require('rimraf');
+const { rimrafSync } = require('rimraf');
 const uniqueId = require('lodash/uniqueId');
 const sizeOf = require('image-size');
 const { SnapshotState } = require('jest-snapshot');
@@ -37,11 +37,11 @@ describe('toMatchImageSnapshot', () => {
   });
 
   beforeEach(() => {
-    rimraf.sync(`**/${cleanupRequiredIndicator}*`);
+    rimrafSync(`**/${cleanupRequiredIndicator}*`, { glob: true });
   });
 
   afterAll(() => {
-    rimraf.sync(`**/${cleanupRequiredIndicator}*`);
+    rimrafSync(`**/${cleanupRequiredIndicator}*`, { glob: true });
   });
 
   describe('happy path', () => {
@@ -312,7 +312,7 @@ describe('toMatchImageSnapshot', () => {
       expect(fs.existsSync(pathToResultImage))
         .toBe(true);
 
-      expect(fs.readFileSync(pathToResultImage)).toEqual(largeImageFailureDiffData);
+      expect(fs.readFileSync(pathToResultImage)).toMatchImageSnapshot(largeImageFailureDiffData);
       // just because file was written does not mean it is a png image
       expect(sizeOf(pathToResultImage))
         .toHaveProperty('type', 'png');

diff --git a/__tests__/outdated-snapshot-reporter.spec.js b/__tests__/outdated-snapshot-reporter.spec.js
@@ -16,7 +16,6 @@ const fs = require('fs');
 const os = require('os');
 const childProcess = require('child_process');
 const path = require('path');
-const rimraf = require('rimraf');
 
 describe('OutdatedSnapshotReporter', () => {
   const jestImageSnapshotDir = path.join(__dirname, '..');
@@ -61,6 +60,7 @@ describe('OutdatedSnapshotReporter', () => {
       cwd: tmpDir,
       encoding: 'utf-8',
       env: { ...process.env, ...environment },
+      shell: true,
     });
     if (child.error) throw child.error;
 
@@ -79,7 +79,7 @@ describe('OutdatedSnapshotReporter', () => {
   });
 
   afterAll(() => {
-    rimraf.sync(tmpDir);
+    fs.rmSync(tmpDir, { recursive: true, force: true });
   });
 
   it('should write the image snapshot on first run', () => {