fix: tests

Author: ThaUnknown

.airtap.yml

@@ -1,17 +1,19 @@
-sauce_connect: true
 browsers:
   - name: chrome
     version: latest
   - name: firefox
     version: latest
-  - name: safari
+  # https://github.com/airtap/sauce/issues/11
+  # - name: safari
+  #   version: latest
+  - name: edge
     version: latest
-  - name: microsoftedge
+  - name: and_chr
     version: latest
-  - name: iphone
-    version: latest
-  - name: android
+  - name: ios_saf
     version: latest
+providers:
+  - airtap-system
 presets:
   local:
     providers: airtap-manual
@@ -21,4 +23,4 @@ browserify:
   - transform: babelify
     global: true
     presets: ['@babel/preset-env']
-    plugins: ['@babel/plugin-syntax-import-assertions']
+    plugins: ['@babel/plugin-syntax-import-assertions']

.github/workflows/ci.yml

@@ -1,28 +1,49 @@
 name: ci
-'on':
-  - push
-  - pull_request
+on:
+  push:
+    branches:
+      - master
+    tags-ignore:
+      - '*'
+  pull_request:
+    branches:
+      - master
+concurrency: 
+  group: ${{ github.ref }}
+  cancel-in-progress: true
 jobs:
   test:
     name: Node ${{ matrix.node }} / ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
-    environment: ci
     strategy:
       fail-fast: false
       matrix:
         os:
           - ubuntu-latest
         node:
-          - '14'
+          - '18'
+          - '16'
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - name: Install Setuptools for Python
+        run: pip3 install setuptools
+
+      - name: Check out Git repository
+        uses: actions/checkout@v3
+
+      - name: Setup PNPM
+        uses: pnpm/action-setup@v2.2.2
+        with:
+          version: 8.6.3
+
+      - name: Setup Node
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
-      - run: npm install
-      - run: npm run build --if-present
+          cache: 'pnpm'
+
+      - run: pnpm install --frozen-lockfile
       - run: echo "127.0.0.1 airtap.local" | sudo tee -a /etc/hosts
-      - run: npm test
+      - run: pnpm test
         env:
           SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
-          SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
+          SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}

.gitignore

@@ -1,4 +1,3 @@
 .nyc_output
 node_modules
 package-lock.json
-pnpm-lock.yaml

package.json

@@ -28,12 +28,14 @@
     "@babel/preset-env": "^7.20.2",
     "airtap": "^4.0.4",
     "airtap-manual": "^1.0.0",
+    "airtap-system": "^0.1.0",
     "babelify": "^10.0.0",
     "bowser": "^2.11.0",
     "cross-env": "^7.0.3",
     "prettier-bytes": "^1.0.4",
     "speedometer": "^1.1.0",
     "string-to-stream": "^3.0.1",
+    "tap-spec": "^5.0.0",
     "tape": "^5.5.2",
     "thunky": "^1.1.0",
     "ws": "^7.5.3"
@@ -61,7 +63,8 @@
   },
   "scripts": {
     "test": "npm run test-node && npm run test-browser",
-    "test-browser-local": "airtap --preset local -- test/*.js",
+    "test-browser": "airtap --concurrency 1 --all -- test/*.js test/browser/*.js | tap-spec",
+    "test-browser-local": "airtap --preset local -- test/*.js | tap-spec",
     "test-node": "tape test/*.js",
     "test-node-debug": "cross-env DEBUG=* tape test/negotiation.js"
   },