test: slowly removing testOptions (#3464)

microsoft · Aug 14, 2020 · 2f5a0a6 · 2f5a0a6
1 parent 036cd5c
commit 2f5a0a6
Show file tree

Hide file tree

Showing 128 changed files with 130 additions and 437 deletions.
diff --git a/docs/test-runners.md b/docs/test-runners.md
@@ -34,6 +34,7 @@ beforeEach(async () => {
 afterEach(async () => {
   await page.close();
 });
+
 it('should work', async () => {
   await page.goto('https://www.example.com/');
   expect(await page.title()).toBe('Example Domain');
@@ -90,6 +91,7 @@ beforeEach(async() => {
 afterEach(async () => {
   await page.close();
 });
+
 it('should work', async () => {
   await page.goto('https://www.example.com/');
   assert.equal(await page.title(), 'Example Domain');

diff --git a/test/accessibility.spec.ts b/test/accessibility.spec.ts
@@ -16,8 +16,6 @@
  */
 import './base.fixture';
 
-const {FFOX, CHROMIUM, WEBKIT} = testOptions;
-
 it('should work', async function({page}) {
   await page.setContent(`
   <head>

diff --git a/test/autowaiting-basic.spec.ts b/test/autowaiting-basic.spec.ts
@@ -15,10 +15,7 @@
  * limitations under the License.
  */
 import './base.fixture';
-
-import utils from './utils';
-
-const {WIRE} = testOptions;
+const { WIRE } = testOptions;
 
 it('should await navigation when clicking anchor', async({page, server}) => {
   const messages = [];

diff --git a/test/autowaiting-no-hang.spec.ts b/test/autowaiting-no-hang.spec.ts
@@ -16,8 +16,6 @@
  */
 import './base.fixture';
 
-import utils from './utils';
-
 it('clicking on links which do not commit navigation', async({page, server, httpsServer}) => {
   await page.goto(server.EMPTY_PAGE);
   await page.setContent(`<a href='${httpsServer.EMPTY_PAGE}'>foobar</a>`);

diff --git a/test/base.fixture.ts b/test/base.fixture.ts
@@ -32,6 +32,7 @@ import {mkdtempAsync, removeFolderAsync} from './utils';
 setUnderTest(); // Note: we must call setUnderTest before requiring Playwright
 
 const browserName = process.env.BROWSER || 'chromium';
+const platform = os.platform();
 
 declare global {
   interface WorkerState {
@@ -54,6 +55,13 @@ declare global {
   }
 }
 
+(global as any).MAC = platform === 'darwin';
+(global as any).LINUX = platform === 'linux';
+(global as any).WIN = platform === 'win32';
+(global as any).CHROMIUM = browserName === 'chromium';
+(global as any).FFOX = browserName === 'firefox';
+(global as any).WEBKIT = browserName === 'webkit';
+
 registerWorkerFixture('parallelIndex', async ({}, test) => {
   await test(parseInt(process.env.JEST_WORKER_ID, 10) - 1);
 });
@@ -180,7 +188,7 @@ registerFixture('httpsServer', async ({httpService}, test) => {
 registerFixture('tmpDir', async ({}, test) => {
   const tmpDir = await mkdtempAsync(path.join(os.tmpdir(), 'playwright-test-'));
   await test(tmpDir);
-  await removeFolderAsync(tmpDir);
+  await removeFolderAsync(tmpDir).catch(e => {});
 });
 
 registerWorkerFixture('asset', async ({}, test) => {

diff --git a/test/browser.spec.ts b/test/browser.spec.ts
@@ -16,7 +16,6 @@
 import './base.fixture';
 
 import utils from './utils';
-const {CHROMIUM} = testOptions;
 
 it('should create new page', async function({browser}) {
   const page1 = await browser.newPage();

diff --git a/test/browsercontext-add-cookies.spec.ts b/test/browsercontext-add-cookies.spec.ts
@@ -16,9 +16,6 @@
  */
 import './base.fixture';
 
-import utils from './utils';
-const {FFOX, CHROMIUM} = testOptions;
-
 it('should work', async({context, page, server}) => {
   await page.goto(server.EMPTY_PAGE);
   await context.addCookies([{

diff --git a/test/browsercontext-basic.spec.ts b/test/browsercontext-basic.spec.ts
@@ -18,8 +18,6 @@ import './base.fixture';
 
 import utils from './utils';
 
-const {WEBKIT} = testOptions;
-
 it('should create new context', async function({browser}) {
   expect(browser.contexts().length).toBe(0);
   const context = await browser.newContext();

diff --git a/test/browsercontext-cookies.spec.ts b/test/browsercontext-cookies.spec.ts
@@ -16,9 +16,6 @@
  */
 import './base.fixture';
 
-import utils from './utils';
-const {FFOX, WEBKIT, WIN} = testOptions;
-
 it('should return no cookies in pristine browser context', async({context, page, server}) => {
   expect(await context.cookies()).toEqual([]);
 });

diff --git a/test/browsercontext-credentials.spec.ts b/test/browsercontext-credentials.spec.ts
@@ -16,8 +16,7 @@
  */
 import './base.fixture';
 
-import utils from './utils';
-const {CHROMIUM, HEADLESS} = testOptions;
+const { HEADLESS } = testOptions;
 
 it.fail(CHROMIUM && !HEADLESS)('should fail without credentials', async({browser, server}) => {
   server.setAuth('/empty.html', 'user', 'pass');

diff --git a/test/browsercontext-device.spec.ts b/test/browsercontext-device.spec.ts
@@ -16,9 +16,6 @@
  */
 import './base.fixture';
 
-import utils from './utils';
-const {FFOX} = testOptions;
-
 it.skip(FFOX)('should work', async({playwright, browser, server}) => {
   const iPhone = playwright.devices['iPhone 6'];
   const context = await browser.newContext({ ...iPhone });

diff --git a/test/browsercontext-expose-function.spec.ts b/test/browsercontext-expose-function.spec.ts
@@ -16,10 +16,6 @@
  */
 import './base.fixture';
 
-import utils from './utils';
-const {FFOX, CHROMIUM, WEBKIT, MAC, HEADLESS} = testOptions;
-const {devices} = require('..');
-
 it('expose binding should work', async({browser}) => {
   const context = await browser.newContext();
   let bindingSource;

diff --git a/test/browsercontext-locale.spec.ts b/test/browsercontext-locale.spec.ts
@@ -16,9 +16,6 @@
  */
 import './base.fixture';
 
-import utils from './utils';
-const {CHROMIUM, FFOX, MAC, HEADLESS} = testOptions;
-
 it('should affect accept-language header', async({browser, server}) => {
   const context = await browser.newContext({ locale: 'fr-CH' });
   const page = await context.newPage();

diff --git a/test/browsercontext-page-event.spec.ts b/test/browsercontext-page-event.spec.ts
@@ -15,9 +15,6 @@
  * limitations under the License.
  */
 import './base.fixture';
-import utils from './utils';
-const {FFOX, CHROMIUM, WEBKIT, MAC, HEADLESS} = testOptions;
-const {devices} = require('..');
 
 it('should have url', async({browser, server}) => {
   const context = await browser.newContext();

diff --git a/test/browsercontext-route.spec.ts b/test/browsercontext-route.spec.ts
@@ -16,10 +16,6 @@
  */
 import './base.fixture';
 
-import utils from './utils';
-const {FFOX, CHROMIUM, WEBKIT, MAC, HEADLESS} = testOptions;
-const {devices} = require('..');
-
 it('should intercept', async({browser, server}) => {
   const context = await browser.newContext();
   let intercepted = false;

diff --git a/test/browsercontext-timezone-id.spec.ts b/test/browsercontext-timezone-id.spec.ts
@@ -16,9 +16,6 @@
  */
 import './base.fixture';
 
-import utils from './utils';
-const {CHROMIUM, FFOX, MAC, HEADLESS} = testOptions;
-
 it('should work', async ({ browser }) => {
   const func = () => new Date(1479579154987).toString();
   {

diff --git a/test/browsercontext-user-agent.spec.ts b/test/browsercontext-user-agent.spec.ts
@@ -17,7 +17,6 @@
 import './base.fixture';
 
 import utils from './utils';
-const {FFOX, CHROMIUM, WEBKIT, MAC, HEADLESS} = testOptions;
 const {devices} = require('..');
 
 it('should work', async({browser, server}) => {

diff --git a/test/browsercontext-viewport-mobile.spec.ts b/test/browsercontext-viewport-mobile.spec.ts
@@ -16,9 +16,6 @@
  */
 import './base.fixture';
 
-import utils from './utils';
-const {CHROMIUM, FFOX, MAC, HEADLESS} = testOptions;
-
 it.skip(FFOX)('should support mobile emulation', async({playwright, browser, server}) => {
   const iPhone = playwright.devices['iPhone 6'];
   const context = await browser.newContext({ ...iPhone });

diff --git a/test/browsercontext-viewport.spec.ts b/test/browsercontext-viewport.spec.ts
@@ -17,7 +17,6 @@
 import './base.fixture';
 
 import utils from './utils';
-const {CHROMIUM, FFOX, MAC, HEADLESS} = testOptions;
 
 it('should get the proper default viewport size', async({page, server}) => {
   await utils.verifyViewport(page, 1280, 720);

diff --git a/test/browsertype-basic.spec.ts b/test/browsertype-basic.spec.ts
@@ -14,12 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import './base.fixture';
 
-import path from 'path';
 import fs from 'fs';
-import utils from './utils';
-const {FFOX, CHROMIUM, WEBKIT, WIN, WIRE} = testOptions;
+import './base.fixture';
 
 it('browserType.executablePath should work', async({browserType}) => {
   const executablePath = browserType.executablePath();

diff --git a/test/browsertype-connect.spec.ts b/test/browsertype-connect.spec.ts
@@ -16,8 +16,7 @@
  */
 import './base.fixture';
 
-import utils from './utils';
-const {FFOX, CHROMIUM, WEBKIT, WIN, WIRE} = testOptions;
+const { WIRE } = testOptions;
 
 it.skip(WIRE).slow()('should be able to reconnect to a browser', async({browserType, defaultBrowserOptions, server}) => {
   const browserServer = await browserType.launchServer(defaultBrowserOptions);

diff --git a/test/browsertype-launch-server.spec.ts b/test/browsertype-launch-server.spec.ts
@@ -16,10 +16,7 @@
  */
 import './base.fixture';
 
-import path from 'path';
-import fs from 'fs';
-import utils from './utils';
-const {FFOX, CHROMIUM, WEBKIT, WIN, WIRE} = testOptions;
+const { WIRE } = testOptions;
 
 it.skip(WIRE)('should work', async({browserType, defaultBrowserOptions}) => {
   const browserServer = await browserType.launchServer(defaultBrowserOptions);

diff --git a/test/browsertype-launch.spec.ts b/test/browsertype-launch.spec.ts
@@ -14,12 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import './base.fixture';
 
 import path from 'path';
-import fs from 'fs';
-import utils from './utils';
-const {FFOX, CHROMIUM, WEBKIT, WIN, WIRE} = testOptions;
+import './base.fixture';
+
+const { WIRE } = testOptions;
 
 it('should reject all promises when browser is closed', async({browserType, defaultBrowserOptions}) => {
   const browser = await browserType.launch(defaultBrowserOptions);

diff --git a/test/capabilities.spec.ts b/test/capabilities.spec.ts
@@ -13,12 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import './base.fixture';
 
-import path from 'path';
 import url from 'url';
-
-const {FFOX, CHROMIUM, WEBKIT, WIN, LINUX} = testOptions;
+import './base.fixture';
 
 it.fail(WEBKIT && WIN)('Web Assembly should work', async function({page, server}) {
   await page.goto(server.PREFIX + '/wasm/table2.html');

diff --git a/test/channels.spec.ts b/test/channels.spec.ts
@@ -15,10 +15,7 @@
  * limitations under the License.
  */
 import './base.fixture';
-
-import utils from './utils';
 import { ChromiumBrowser } from '..';
-const { FFOX, CHROMIUM, WEBKIT, WIN } = testOptions;
 
 it('should work', async({browser}) => {
   expect(!!browser['_connection']).toBeTruthy();

diff --git a/test/chromium-css-coverage.spec.ts b/test/chromium-css-coverage.spec.ts
@@ -15,9 +15,6 @@
  */
 import './base.fixture';
 
-import utils from './utils';
-const {FFOX, CHROMIUM, WEBKIT} = testOptions;
-
 it.skip(!CHROMIUM)('should work', async function({browserType, page, server}) {
   await page.coverage.startCSSCoverage();
   await page.goto(server.PREFIX + '/csscoverage/simple.html');

diff --git a/test/chromium-js-coverage.spec.ts b/test/chromium-js-coverage.spec.ts
@@ -15,9 +15,6 @@
  */
 import './base.fixture';
 
-import utils from './utils';
-const {FFOX, CHROMIUM, WEBKIT} = testOptions;
-
 it.skip(CHROMIUM)('should be missing', async function({page, server}) {
   expect(page.coverage).toBe(null);
 });

diff --git a/test/chromium/chromium.spec.ts b/test/chromium/chromium.spec.ts
@@ -16,8 +16,6 @@
 import '../base.fixture';
 import { ChromiumBrowserContext } from '../..';
 
-const {FFOX, CHROMIUM, WEBKIT} = testOptions;
-
 it.skip(!CHROMIUM)('should create a worker from a service worker', async({page, server, context}) => {
   const [worker] = await Promise.all([
     (context as ChromiumBrowserContext).waitForEvent('serviceworker'),

diff --git a/test/chromium/launcher.spec.ts b/test/chromium/launcher.spec.ts
@@ -18,8 +18,8 @@ import '../base.fixture';
 import path from 'path';
 import utils from '../utils';
 import { ChromiumBrowser, ChromiumBrowserContext } from '../..';
-const {makeUserDataDir, removeUserDataDir} = utils;
-const {FFOX, CHROMIUM, WEBKIT, WIN, WIRE} = testOptions;
+const { makeUserDataDir, removeUserDataDir } = utils;
+const { WIRE } = testOptions;
 
 it.skip(WIRE || !CHROMIUM)('should throw with remote-debugging-pipe argument', async({browserType, defaultBrowserOptions}) => {
   const options = Object.assign({}, defaultBrowserOptions);

diff --git a/test/chromium/oopif.spec.ts b/test/chromium/oopif.spec.ts
@@ -17,8 +17,6 @@
 import '../base.fixture';
 import { registerWorkerFixture } from '../runner/fixtures';
 
-const {CHROMIUM} = testOptions;
-
 registerWorkerFixture('browser', async ({browserType, defaultBrowserOptions}, test) => {
   const browser = await browserType.launch({
     ...defaultBrowserOptions,

diff --git a/test/chromium/session.spec.ts b/test/chromium/session.spec.ts
@@ -16,8 +16,6 @@
 import '../base.fixture';
 import { ChromiumBrowserContext, ChromiumBrowser } from "../../types/types";
 
-const {FFOX, CHROMIUM, WEBKIT, WIRE} = testOptions;
-
 it.skip(!CHROMIUM)('should work', async function({page}) {
   const client = await (page.context() as ChromiumBrowserContext).newCDPSession(page);
 

diff --git a/test/chromium/tracing.spec.ts b/test/chromium/tracing.spec.ts
@@ -19,12 +19,13 @@ import { registerFixture } from '../runner/fixtures';
 import fs from 'fs';
 import path from 'path';
 import { ChromiumBrowser } from '../..';
-const {FFOX, CHROMIUM, WEBKIT} = testOptions;
+
 declare global {
   interface FixtureState {
     outputFile: string;
   }
 }
+
 registerFixture('outputFile', async ({tmpDir}, test) => {
   const outputFile = path.join(tmpDir, `trace.json`);
   await test(outputFile);

diff --git a/test/click-react.spec.ts b/test/click-react.spec.ts
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 import './base.fixture';
-import utils from './utils';
 
 declare const renderComponent;
 declare const e;

diff --git a/test/click-timeout-1.spec.ts b/test/click-timeout-1.spec.ts
@@ -16,8 +16,7 @@
  */
 import './base.fixture';
 
-import utils from './utils';
-const {WIRE} = testOptions;
+const { WIRE } = testOptions;
 
 it.skip(WIRE)('should avoid side effects after timeout', async({page, server}) => {
   await page.goto(server.PREFIX + '/input/button.html');

diff --git a/test/click-timeout-2.spec.ts b/test/click-timeout-2.spec.ts
@@ -16,9 +16,6 @@
  */
 import './base.fixture';
 
-import utils from './utils';
-const {WIRE} = testOptions;
-
 it('should timeout waiting for display:none to be gone', async({page, server}) => {
   await page.goto(server.PREFIX + '/input/button.html');
   await page.$eval('button', b => b.style.display = 'none');

diff --git a/test/click-timeout-3.spec.ts b/test/click-timeout-3.spec.ts
@@ -16,8 +16,7 @@
  */
 import './base.fixture';
 
-import utils from './utils';
-const {WIRE} = testOptions;
+const { WIRE } = testOptions;
 
 it.skip(WIRE)('should fail when element jumps during hit testing', async({page, server}) => {
   await page.setContent('<button>Click me</button>');