Merge e8318bc into 51222e7

krisl · Mar 24, 2024 · f58792d · f58792d
2 parents 51222e7 + e8318bc
commit f58792d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -25,7 +25,7 @@ jobs:
       with:
         show-progress: false
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'npm'
@@ -52,6 +52,11 @@ jobs:
     - uses: oven-sh/setup-bun@v1
       with:
         bun-version: ${{ matrix.node-version }}
+    - uses: actions/cache@v3
+      with:
+        path: ~/.bun/install/cache
+        key: "bun-${{ hashFiles('package-lock.json') }}"
+        restore-keys: "bun-"
     - run: bun install
     - run: bun test
 

diff --git a/src/graph.test.ts b/src/graph.test.ts
@@ -1247,9 +1247,7 @@ describe('Components', () => {
             expect(logSpyWarn).toHaveBeenCalled()
             expect(logSpyError).toHaveBeenCalled()
 
-            // needed for bun until resetAllMocks is available
-            logSpyWarn.mockReset()
-            logSpyError.mockReset()
+            jest.resetAllMocks()
         })
 
         describe('Locking in both directions', () => {
@@ -1352,8 +1350,7 @@ describe('Exceptions', () => {
         expect(nodeB.isLocked()).toBeFalsy()
         expect(nodeC.isLocked()).toBeFalsy()
 
-        // needed for bun until resetAllMocks is available
-        logSpyError.mockReset()
+        jest.resetAllMocks()
     })
     test('arrivedAt bounds', () => {
         const getLockForLink = (from: Lock, to: Lock) => {