From eb018447100088e9ed7b7520e4c6375d2c4e6437 Mon Sep 17 00:00:00 2001 From: Dmitry Gozman Date: Tue, 8 Jun 2021 08:35:04 -0700 Subject: [PATCH] chore(tests): roll stable test runner to jun-8-2021 (#6951) --- tests/config/baseTest.ts | 5 +- tests/config/default.config.ts | 2 +- tests/config/test-runner/package-lock.json | 164 +++++++++------------ tests/config/test-runner/package.json | 2 +- 4 files changed, 71 insertions(+), 102 deletions(-) diff --git a/tests/config/baseTest.ts b/tests/config/baseTest.ts index 6443662c04..f1c5272a21 100644 --- a/tests/config/baseTest.ts +++ b/tests/config/baseTest.ts @@ -15,7 +15,7 @@ */ import { TestServer } from '../../utils/testserver'; -import { Fixtures, TestType } from './test-runner'; +import { Fixtures, _baseTest } from './test-runner'; import * as path from 'path'; import * as fs from 'fs'; import socks from 'socksv5'; @@ -230,5 +230,4 @@ const coverageFixtures: Fixtures<{}, CoverageOptions & { __collectCoverage: void export type CommonOptions = BaseOptions & ServerOptions & CoverageOptions; export type CommonWorkerFixtures = CommonOptions & BaseFixtures; -const __baseTest = require('./test-runner').__baseTest as TestType<{}, {}>; -export const baseTest = __baseTest.extend<{}, CoverageOptions>(coverageFixtures).extend(serverFixtures).extend<{}, BaseOptions & BaseFixtures>(baseFixtures); +export const baseTest = _baseTest.extend<{}, CoverageOptions>(coverageFixtures).extend(serverFixtures).extend<{}, BaseOptions & BaseFixtures>(baseFixtures); diff --git a/tests/config/default.config.ts b/tests/config/default.config.ts index 5210a4c9ab..4f5650f28d 100644 --- a/tests/config/default.config.ts +++ b/tests/config/default.config.ts @@ -66,7 +66,7 @@ for (const browserName of browserNames) { if (executablePath && !process.env.TEST_WORKER_INDEX) console.error(`Using executable at ${executablePath}`); const testIgnore: RegExp[] = browserNames.filter(b => b !== browserName).map(b => new RegExp(b)); - testIgnore.push(/android/, /electron/, /playwrigh-test/); + testIgnore.push(/android/, /electron/, /playwright-test/); config.projects.push({ name: browserName, testDir, diff --git a/tests/config/test-runner/package-lock.json b/tests/config/test-runner/package-lock.json index 8d2a2c17cf..e0595fa7c0 100644 --- a/tests/config/test-runner/package-lock.json +++ b/tests/config/test-runner/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "@playwright/test": "=1.12.0-next-1622928816000" + "@playwright/test": "=1.12.0-next-alpha-jun-8-2021" } }, "node_modules/@babel/code-frame": { @@ -633,23 +633,46 @@ } }, "node_modules/@playwright/test": { - "version": "1.12.0-next-1622928816000", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.12.0-next-1622928816000.tgz", - "integrity": "sha512-vOitU8srbM0mk7hHsklchL06Tmd7j2NF4wawBkRsdTHg/ANn2Qvm4qSfplf4zXZbdlNiiAvsvXXhhBteXbLAmA==", + "version": "1.12.0-next-alpha-jun-8-2021", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.12.0-next-alpha-jun-8-2021.tgz", + "integrity": "sha512-20v8n4EiaV/z30Ahr/fcUeXfsvQXIMiOI7c2xMVOgQIAkM+7Ck+MKw9ePH3k6pTchHwzJfCqDzWSvvhkIqKAeA==", "hasInstallScript": true, "dependencies": { + "@babel/code-frame": "^7.12.13", + "@babel/core": "^7.14.0", + "@babel/plugin-proposal-class-properties": "^7.13.0", + "@babel/plugin-proposal-dynamic-import": "^7.13.8", + "@babel/plugin-proposal-export-namespace-from": "^7.12.13", + "@babel/plugin-proposal-logical-assignment-operators": "^7.13.8", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8", + "@babel/plugin-proposal-numeric-separator": "^7.12.13", + "@babel/plugin-proposal-optional-chaining": "^7.13.12", + "@babel/plugin-proposal-private-methods": "^7.13.0", + "@babel/plugin-proposal-private-property-in-object": "^7.14.0", + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-json-strings": "^7.8.3", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", + "@babel/plugin-transform-modules-commonjs": "^7.14.0", + "@babel/preset-typescript": "^7.13.0", + "colors": "^1.4.0", "commander": "^6.1.0", "debug": "^4.1.1", + "expect": "^26.4.2", "extract-zip": "^2.0.1", - "folio": "=0.4.0-alpha28", "https-proxy-agent": "^5.0.0", "jpeg-js": "^0.4.2", "mime": "^2.4.6", + "minimatch": "^3.0.3", + "ms": "^2.1.2", + "pirates": "^4.0.1", + "pixelmatch": "^5.2.1", "pngjs": "^5.0.0", "progress": "^2.0.3", "proper-lockfile": "^4.1.1", "proxy-from-env": "^1.1.0", "rimraf": "^3.0.2", + "source-map-support": "^0.4.18", "stack-utils": "^2.0.3", "ws": "^7.4.6", "yazl": "^2.5.1" @@ -820,9 +843,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001234", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001234.tgz", - "integrity": "sha512-a3gjUVKkmwLdNysa1xkUAwN2VfJUJyVW47rsi3aCbkRCtbHAfo+rOsCqVw29G6coQ8gzAPb5XBXwiGHwme3isA==", + "version": "1.0.30001235", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001235.tgz", + "integrity": "sha512-zWEwIVqnzPkSAXOUlQnPW2oKoYb2aLQ4Q5ejdjBcnH63rfypaW34CxaeBn1VMya2XaEU3P/R2qHpWyj+l0BT1A==", "funding": { "type": "opencollective", "url": "https://opencollective.com/browserslist" @@ -1036,47 +1059,6 @@ "node": ">=8" } }, - "node_modules/folio": { - "version": "0.4.0-alpha28", - "resolved": "https://registry.npmjs.org/folio/-/folio-0.4.0-alpha28.tgz", - "integrity": "sha512-sbHdEDRXPkkhzHAyRy/tQKTWImNy38cICoii4ox9AGYFVWgF+i4l37AL2cVfJkUEvUqZpq+u4NkuV1cMelV5AA==", - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@babel/core": "^7.14.0", - "@babel/plugin-proposal-class-properties": "^7.13.0", - "@babel/plugin-proposal-dynamic-import": "^7.13.8", - "@babel/plugin-proposal-export-namespace-from": "^7.12.13", - "@babel/plugin-proposal-logical-assignment-operators": "^7.13.8", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8", - "@babel/plugin-proposal-numeric-separator": "^7.12.13", - "@babel/plugin-proposal-optional-chaining": "^7.13.12", - "@babel/plugin-proposal-private-methods": "^7.13.0", - "@babel/plugin-proposal-private-property-in-object": "^7.14.0", - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/plugin-syntax-json-strings": "^7.8.3", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-transform-modules-commonjs": "^7.14.0", - "@babel/preset-typescript": "^7.13.0", - "colors": "^1.4.0", - "commander": "^6.1.0", - "expect": "^26.4.2", - "jpeg-js": "^0.4.2", - "minimatch": "^3.0.3", - "ms": "^2.1.2", - "pirates": "^4.0.1", - "pixelmatch": "^5.2.1", - "rimraf": "^3.0.2", - "source-map-support": "^0.4.18", - "stack-utils": "^2.0.2" - }, - "bin": { - "folio": "cli.js" - }, - "engines": { - "node": ">=10.17.0" - } - }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -1561,9 +1543,9 @@ } }, "node_modules/node-releases": { - "version": "1.1.72", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz", - "integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==" + "version": "1.1.73", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz", + "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==" }, "node_modules/object-keys": { "version": "1.1.1", @@ -2410,22 +2392,45 @@ } }, "@playwright/test": { - "version": "1.12.0-next-1622928816000", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.12.0-next-1622928816000.tgz", - "integrity": "sha512-vOitU8srbM0mk7hHsklchL06Tmd7j2NF4wawBkRsdTHg/ANn2Qvm4qSfplf4zXZbdlNiiAvsvXXhhBteXbLAmA==", + "version": "1.12.0-next-alpha-jun-8-2021", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.12.0-next-alpha-jun-8-2021.tgz", + "integrity": "sha512-20v8n4EiaV/z30Ahr/fcUeXfsvQXIMiOI7c2xMVOgQIAkM+7Ck+MKw9ePH3k6pTchHwzJfCqDzWSvvhkIqKAeA==", "requires": { + "@babel/code-frame": "^7.12.13", + "@babel/core": "^7.14.0", + "@babel/plugin-proposal-class-properties": "^7.13.0", + "@babel/plugin-proposal-dynamic-import": "^7.13.8", + "@babel/plugin-proposal-export-namespace-from": "^7.12.13", + "@babel/plugin-proposal-logical-assignment-operators": "^7.13.8", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8", + "@babel/plugin-proposal-numeric-separator": "^7.12.13", + "@babel/plugin-proposal-optional-chaining": "^7.13.12", + "@babel/plugin-proposal-private-methods": "^7.13.0", + "@babel/plugin-proposal-private-property-in-object": "^7.14.0", + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-json-strings": "^7.8.3", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", + "@babel/plugin-transform-modules-commonjs": "^7.14.0", + "@babel/preset-typescript": "^7.13.0", + "colors": "^1.4.0", "commander": "^6.1.0", "debug": "^4.1.1", + "expect": "^26.4.2", "extract-zip": "^2.0.1", - "folio": "=0.4.0-alpha28", "https-proxy-agent": "^5.0.0", "jpeg-js": "^0.4.2", "mime": "^2.4.6", + "minimatch": "^3.0.3", + "ms": "^2.1.2", + "pirates": "^4.0.1", + "pixelmatch": "^5.2.1", "pngjs": "^5.0.0", "progress": "^2.0.3", "proper-lockfile": "^4.1.1", "proxy-from-env": "^1.1.0", "rimraf": "^3.0.2", + "source-map-support": "^0.4.18", "stack-utils": "^2.0.3", "ws": "^7.4.6", "yazl": "^2.5.1" @@ -2562,9 +2567,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001234", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001234.tgz", - "integrity": "sha512-a3gjUVKkmwLdNysa1xkUAwN2VfJUJyVW47rsi3aCbkRCtbHAfo+rOsCqVw29G6coQ8gzAPb5XBXwiGHwme3isA==" + "version": "1.0.30001235", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001235.tgz", + "integrity": "sha512-zWEwIVqnzPkSAXOUlQnPW2oKoYb2aLQ4Q5ejdjBcnH63rfypaW34CxaeBn1VMya2XaEU3P/R2qHpWyj+l0BT1A==" }, "chalk": { "version": "2.4.2", @@ -2724,41 +2729,6 @@ "to-regex-range": "^5.0.1" } }, - "folio": { - "version": "0.4.0-alpha28", - "resolved": "https://registry.npmjs.org/folio/-/folio-0.4.0-alpha28.tgz", - "integrity": "sha512-sbHdEDRXPkkhzHAyRy/tQKTWImNy38cICoii4ox9AGYFVWgF+i4l37AL2cVfJkUEvUqZpq+u4NkuV1cMelV5AA==", - "requires": { - "@babel/code-frame": "^7.12.13", - "@babel/core": "^7.14.0", - "@babel/plugin-proposal-class-properties": "^7.13.0", - "@babel/plugin-proposal-dynamic-import": "^7.13.8", - "@babel/plugin-proposal-export-namespace-from": "^7.12.13", - "@babel/plugin-proposal-logical-assignment-operators": "^7.13.8", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8", - "@babel/plugin-proposal-numeric-separator": "^7.12.13", - "@babel/plugin-proposal-optional-chaining": "^7.13.12", - "@babel/plugin-proposal-private-methods": "^7.13.0", - "@babel/plugin-proposal-private-property-in-object": "^7.14.0", - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/plugin-syntax-json-strings": "^7.8.3", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-transform-modules-commonjs": "^7.14.0", - "@babel/preset-typescript": "^7.13.0", - "colors": "^1.4.0", - "commander": "^6.1.0", - "expect": "^26.4.2", - "jpeg-js": "^0.4.2", - "minimatch": "^3.0.3", - "ms": "^2.1.2", - "pirates": "^4.0.1", - "pixelmatch": "^5.2.1", - "rimraf": "^3.0.2", - "source-map-support": "^0.4.18", - "stack-utils": "^2.0.2" - } - }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -3105,9 +3075,9 @@ "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=" }, "node-releases": { - "version": "1.1.72", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz", - "integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==" + "version": "1.1.73", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz", + "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==" }, "object-keys": { "version": "1.1.1", diff --git a/tests/config/test-runner/package.json b/tests/config/test-runner/package.json index 5e1541a390..c2dfc51700 100644 --- a/tests/config/test-runner/package.json +++ b/tests/config/test-runner/package.json @@ -1,6 +1,6 @@ { "private": true, "dependencies": { - "@playwright/test": "=1.12.0-next-1622928816000" + "@playwright/test": "=1.12.0-next-alpha-jun-8-2021" } }