Merge pull request #5081 from Tyriar/cleanup

Simplify GH action names and remove test/api project

.eslintrc.json

@@ -11,7 +11,6 @@
       "src/browser/tsconfig.json",
       "src/common/tsconfig.json",
       "src/headless/tsconfig.json",
-      "test/api/tsconfig.json",
       "test/benchmark/tsconfig.json",
       "test/playwright/tsconfig.json",
       "addons/addon-attach/src/tsconfig.json",

.github/workflows/ci.yml

@@ -112,7 +112,7 @@ jobs:
         ./node_modules/.bin/nyc report --reporter=cobertura
         exit $EXIT_CODE
 
-  test-unit-parallel:
+  test-unit:
     timeout-minutes: 20
     strategy:
       matrix:
@@ -150,7 +150,7 @@ jobs:
     - name: Unit tests
       run: yarn test-unit --forbid-only
 
-  test-playwright-parallel:
+  test-integration:
     timeout-minutes: 20
     strategy:
       matrix:
@@ -191,11 +191,11 @@ jobs:
     - name: Build demo
       run: yarn build-demo
     - name: Integration tests (core) # Tests use 50% workers to reduce flakiness
-      run: yarn test-playwright-${{ matrix.browser }} --workers=50% --forbid-only --suite=core
+      run: yarn test-integration-${{ matrix.browser }} --workers=50% --forbid-only --suite=core
     - name: Integration tests (addon-canvas)
-      run: yarn test-playwright-${{ matrix.browser }} --workers=50% --forbid-only --suite=addon-canvas
+      run: yarn test-integration-${{ matrix.browser }} --workers=50% --forbid-only --suite=addon-canvas
     - name: Integration tests (addon-webgl)
-      run: yarn test-playwright-${{ matrix.browser }} --workers=50% --forbid-only --suite=addon-webgl
+      run: yarn test-integration-${{ matrix.browser }} --workers=50% --forbid-only --suite=addon-webgl
 
   release-dry-run:
     needs: build

package.json

@@ -34,11 +34,11 @@
     "lint-api": "eslint --no-eslintrc -c .eslintrc.json.typings --max-warnings 0 --no-ignore --ext .d.ts typings/",
     "test": "npm run test-unit",
     "posttest": "npm run lint",
-    "test-playwright": "node ./bin/test_playwright.js --workers=75%",
-    "test-playwright-chromium": "node ./bin/test_playwright.js --workers=75% \"--project=ChromeStable\"",
-    "test-playwright-firefox": "node ./bin/test_playwright.js --workers=75% \"--project=FirefoxStable\"",
-    "test-playwright-webkit": "node ./bin/test_playwright.js --workers=75% \"--project=WebKit\"",
-    "test-playwright-debug": "node ./bin/test_playwright.js  --workers=1 --headed --timeout=30000",
+    "test-integration": "node ./bin/test_playwright.js --workers=75%",
+    "test-integration-chromium": "node ./bin/test_playwright.js --workers=75% \"--project=ChromeStable\"",
+    "test-integration-firefox": "node ./bin/test_playwright.js --workers=75% \"--project=FirefoxStable\"",
+    "test-integration-webkit": "node ./bin/test_playwright.js --workers=75% \"--project=WebKit\"",
+    "test-integration-debug": "node ./bin/test_playwright.js  --workers=1 --headed --timeout=30000",
     "test-unit": "node ./bin/test.js",
     "test-unit-coverage": "node ./bin/test.js --coverage",
     "test-unit-dev": "cross-env NODE_PATH='./out' mocha",

tsconfig.all.json

@@ -4,7 +4,6 @@
   "references": [
     { "path": "./src/browser" },
     { "path": "./src/headless" },
-    { "path": "./test/api" },
     { "path": "./test/benchmark" },
     { "path": "./test/playwright" },
     { "path": "./addons/addon-attach" },