wip

deepstreamIO · Dec 11, 2021 · 9835a6d · 9835a6d
1 parent 449de40
commit 9835a6d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.x, 14.x]
+        node-version: [14.x, 16.x]
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}
@@ -19,7 +19,7 @@ jobs:
     - run: npm run test:all:coverage
     - run: npm run e2e:uws
     - name: Coveralls
-      if: startsWith(matrix.node-version, '12.')
+      if: startsWith(matrix.node-version, '16.')
       uses: coverallsapp/github-action@master
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,6 +1,6 @@
 name: release
 
-on:  
+on:
   push:
     # Sequence of patterns matched against refs/tags
     tags:
@@ -27,7 +27,7 @@ jobs:
     # Setup .npmrc file to publish to npm
     - uses: actions/setup-node@v1
       with:
-        node-version: '12.x'
+        node-version: '16.x'
         registry-url: 'https://registry.npmjs.org'
     - run: npm install
     - run: npm run lint
@@ -44,12 +44,12 @@ jobs:
       uses: actions/checkout@v2
     - name: Checkout submodules
       run: git submodule update --init --recursive
-    - name: Use Node.js 
+    - name: Use Node.js
       env:
         DEFAULT_DELAY: 50
       uses: actions/setup-node@v1
       with:
-        node-version: '12.x'
+        node-version: '16.x'
     - run: npm install
     - run: npm run lint
     - run: npm run test
@@ -68,12 +68,12 @@ jobs:
       uses: actions/checkout@v2
     - name: Checkout submodules
       run: git submodule update --init --recursive
-    - name: Use Node.js 
+    - name: Use Node.js
       env:
         DEFAULT_DELAY: 50
       uses: actions/setup-node@v1
       with:
-        node-version: '12.x'
+        node-version: '16.x'
     - run: npm install
     - run: npm run lint
     - run: npm run test
@@ -92,12 +92,12 @@ jobs:
       uses: actions/checkout@v2
     - name: Checkout submodules
       run: git submodule update --init --recursive
-    - name: Use Node.js 
+    - name: Use Node.js
       env:
         DEFAULT_DELAY: 50
       uses: actions/setup-node@v1
       with:
-        node-version: '12.x'
+        node-version: '16.x'
     - run: npm install
     - run: npm run lint
     - run: npm run test
@@ -115,5 +115,5 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v1
       with:
-        node-version: '12.x'
+        node-version: '16.x'
     - run: DOCKER_PASSWORD=${{ secrets.DOCKERHUB_TOKEN }} DOCKER_USERNAME=${{ secrets.DOCKERHUB_USERNAME }} bash scripts/docker.sh
diff --git a/src/services/permission/valve/config-permission-cross-reference.spec.ts b/src/services/permission/valve/config-permission-cross-reference.spec.ts
@@ -108,7 +108,9 @@ describe('permission handler loads data for cross referencing', () => {
     }
 
     const onDone = function (socketWrapper, msg, passItOn, error, result) {
-      expect(lastError()).to.contain('TypeError: Cannot read properties of null (reading \'isInStock\')')
+      expect(lastError()).to.contain('TypeError')
+      .and.contain('null')
+      .and.contain('isInStock')
       expect(result).to.equal(false)
       next()
     }

diff --git a/src/services/permission/valve/config-permission-nested-cross-reference.spec.ts b/src/services/permission/valve/config-permission-nested-cross-reference.spec.ts
@@ -62,7 +62,9 @@ describe('permission handler loads data for cross referencing', () => {
     }
 
     const onDone = function (socketWrapper, msg, passItOn, error, result) {
-      expect(lastError()).to.contain('Cannot read properties of undefined (reading \'is\')')
+      expect(lastError()).to.contain('TypeError')
+      .and.contain('undefined')
+      .and.contain('is')
       expect(result).to.equal(false)
       next()
     }