Merge pull request #61 from Roaders/main

Update to handle jest 27

.github/workflows/build.yml

@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x]
+        node-version: [10.x, 12.x, 14.x, 16.x]
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/create-release.yaml

@@ -0,0 +1,38 @@
+name: Create Release
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    name: Create Release
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Setup Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16.x'
+
+      - name: Install node modules and verify build
+        run: npm ci && npm run build-release
+
+      - name: Release
+        uses: justincy/[email protected]
+        id: release
+
+      - name: Print release output
+        if: ${{ steps.release.outputs.released == 'true' }}
+        run: echo Release ID ${{ steps.release.outputs.release_id }}
+
+      - name: Publish
+        if: steps.release.outputs.released == 'true'
+        uses: JS-DevTools/npm-publish@v1
+        with:
+          token: ${{ secrets.NPM_TOKEN }}

main/mock/matchers.ts

@@ -30,13 +30,37 @@ export const matchers = {
     wasCalledAtLeastOnce,
 };
 
+/* istanbul ignore next */
 export function addMatchers() {
     // jasmine.addMatchers must be called in a before function so this will sometimes throw an error
     try {
         jasmine.addMatchers(matchers);
     } catch (e) {
         // NOP
     }
+
+    try {
+        (expect as unknown as jest.Expect).extend({
+            wasCalled: mapToJestCustomMatcher(wasCalled()),
+            wasCalledOnce: mapToJestCustomMatcher(wasCalledOnce()),
+            wasNotCalled: mapToJestCustomMatcher(wasNotCalled()),
+            wasCalledAtLeastOnce: mapToJestCustomMatcher(wasCalledAtLeastOnce()),
+        });
+    } catch (e) {
+        // NOP
+    }
+}
+
+/* istanbul ignore next */
+function mapToJestCustomMatcher(matcher: ICustomMatcher): jest.CustomMatcher {
+    return (context: IFunctionVerifier<any, any>, received: any, ...actual: any[]) => {
+        const result = matcher.compare(context, received, ...actual);
+
+        return {
+            pass: result.pass,
+            message: typeof result.message === 'function' ? result.message : () => result.message || 'failed',
+        };
+    };
 }
 
 function wasCalled(): ICustomMatcher {