test: roll to folio@0.4.0-alpha3

package.json

@@ -87,7 +87,7 @@
     "eslint-plugin-notice": "^0.9.10",
     "eslint-plugin-react-hooks": "^4.2.0",
     "file-loader": "^6.1.0",
-    "folio": "=0.3.21-alpha",
+    "folio": "=0.4.0-alpha4",
     "formidable": "^1.2.2",
     "html-webpack-plugin": "^4.4.1",
     "ncp": "^2.0.0",

tests/android/browser.spec.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { test, expect } from '../config/androidTest';
+import { androidTest as test, expect } from '../config/androidTest';
 
 test('androidDevice.model', async function({ androidDevice }) {
   expect(androidDevice.model()).toBe('sdk_gphone_x86_arm');

tests/android/device.spec.ts

@@ -16,7 +16,7 @@
 
 import fs from 'fs';
 import { PNG } from 'pngjs';
-import { test, expect } from '../config/androidTest';
+import { androidTest as test, expect } from '../config/androidTest';
 
 test('androidDevice.shell', async function({ androidDevice }) {
   const output = await androidDevice.shell('echo 123');
@@ -28,7 +28,7 @@ test('androidDevice.open', async function({ androidDevice }) {
   await socket.write(Buffer.from('321\n'));
   const output = await new Promise(resolve => socket.on('data', resolve));
   expect(output.toString()).toBe('321\n');
-  const closedPromise = new Promise(resolve => socket.on('close', resolve));
+  const closedPromise = new Promise<void>(resolve => socket.on('close', resolve));
   await socket.close();
   await closedPromise;
 });

tests/android/webview.spec.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { test, expect } from '../config/androidTest';
+import { androidTest as test, expect } from '../config/androidTest';
 
 test('androidDevice.webView', async function({ androidDevice }) {
   expect(androidDevice.webViews().length).toBe(0);

tests/beforeunload.spec.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { test as it, expect } from './config/contextTest';
+import { contextTest as it, expect } from './config/browserTest';
 
 it('should close browser with beforeunload page', async ({server, browserType, browserOptions }) => {
   const browser = await browserType.launch(browserOptions);

tests/browser.spec.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { test, expect } from './config/browserTest';
+import { browserTest as test, expect } from './config/browserTest';
 
 test('should create new page', async function({browser}) {
   const page1 = await browser.newPage();

tests/browsercontext-add-cookies.spec.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import { test as it, expect } from './config/contextTest';
-import { slowTest as playwrightTest } from './config/playwrightTest';
+import { contextTest as it, slowPlaywrightTest, expect } from './config/browserTest';
 
 it('should work', async ({context, page, server}) => {
   await page.goto(server.EMPTY_PAGE);
@@ -158,7 +157,7 @@ it('should isolate send cookie header', async ({server, context, browser}) => {
   }
 });
 
-playwrightTest('should isolate cookies between launches', async ({browserType, server, browserOptions}) => {
+slowPlaywrightTest('should isolate cookies between launches', async ({browserType, server, browserOptions}) => {
   const browser1 = await browserType.launch(browserOptions);
   const context1 = await browser1.newContext();
   await context1.addCookies([{url: server.EMPTY_PAGE, name: 'cookie-in-context-1', value: 'value', expires: Date.now() / 1000 + 10000}]);

tests/browsercontext-add-init-script.spec.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { test as it, expect } from './config/contextTest';
+import { contextTest as it, expect } from './config/browserTest';
 
 it('should work with browser context scripts', async ({ context, server }) => {
   await context.addInitScript(() => window['temp'] = 123);

tests/browsercontext-basic.spec.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { test as it, expect } from './config/browserTest';
+import { browserTest as it, expect } from './config/browserTest';
 import { verifyViewport } from './config/utils';
 
 it('should create new context', async function({browser}) {

tests/browsercontext-clearcookies.spec.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { test as it, expect } from './config/contextTest';
+import { contextTest as it, expect } from './config/browserTest';
 
 it('should clear cookies', async ({context, page, server}) => {
   await page.goto(server.EMPTY_PAGE);

tests/browsercontext-cookies.spec.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { test as it, expect } from './config/contextTest';
+import { contextTest as it, expect } from './config/browserTest';
 
 it('should return no cookies in pristine browser context', async ({context, page, server}) => {
   expect(await context.cookies()).toEqual([]);

tests/browsercontext-credentials.spec.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { test as it, expect } from './config/browserTest';
+import { browserTest as it, expect } from './config/browserTest';
 
 it('should fail without credentials', async ({browser, server, browserName, headful}) => {
   it.fail(browserName === 'chromium' && headful);

tests/browsercontext-csp.spec.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { test as it, expect } from './config/browserTest';
+import { browserTest as it, expect } from './config/browserTest';
 import { attachFrame } from './config/utils';
 
 it('should bypass CSP meta tag', async ({browser, server}) => {

tests/browsercontext-device.spec.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { test as it, expect } from './config/browserTest';
+import { browserTest as it, expect } from './config/browserTest';
 
 it.describe('device', () => {
   it.beforeEach(async ({browserName}) => {

tests/browsercontext-dsf.spec.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { test as it, expect } from './config/browserTest';
+import { browserTest as it, expect } from './config/browserTest';
 
 it('should fetch lodpi assets', async ({ contextFactory, server}) => {
   const context = await contextFactory({

tests/browsercontext-expose-function.spec.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { test as it, expect } from './config/contextTest';
+import { contextTest as it, expect } from './config/browserTest';
 
 it('expose binding should work', async ({context}) => {
   let bindingSource;

tests/browsercontext-locale.spec.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { test as it, expect } from './config/browserTest';
+import { browserTest as it, expect } from './config/browserTest';
 
 it('should affect accept-language header', async ({browser, server}) => {
   const context = await browser.newContext({ locale: 'fr-CH' });

tests/browsercontext-page-event.spec.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { test as it, expect } from './config/browserTest';
+import { browserTest as it, expect } from './config/browserTest';
 
 it('should have url', async ({browser, server}) => {
   const context = await browser.newContext();

tests/browsercontext-proxy.spec.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { test as it, expect } from './config/browserTest';
+import { browserTest as it, expect } from './config/browserTest';
 import type { Browser } from '../index';
 
 let browser: Browser;

tests/browsercontext-route.spec.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { test as it, expect } from './config/browserTest';
+import { browserTest as it, expect } from './config/browserTest';
 
 it('should intercept', async ({browser, server}) => {
   const context = await browser.newContext();

tests/browsercontext-set-extra-http-headers.spec.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { test as it, expect } from './config/browserTest';
+import { browserTest as it, expect } from './config/browserTest';
 
 it('should override extra headers from browser context', async ({browser, server}) => {
   const context = await browser.newContext({

tests/browsercontext-storage-state.spec.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { test as it, expect } from './config/browserTest';
+import { browserTest as it, expect } from './config/browserTest';
 import fs from 'fs';
 
 it('should capture local storage', async ({ contextFactory }) => {

tests/browsercontext-timezone-id.spec.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { test as it, expect } from './config/browserTest';
+import { browserTest as it, expect } from './config/browserTest';
 
 it('should work', async ({ browser }) => {
   const func = () => new Date(1479579154987).toString();

tests/browsercontext-user-agent.spec.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { test as it, expect } from './config/browserTest';
+import { browserTest as it, expect } from './config/browserTest';
 import { attachFrame } from './config/utils';
 
 it('should work', async ({browser, server}) => {

tests/browsercontext-viewport-mobile.spec.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { test as it, expect } from './config/browserTest';
+import { browserTest as it, expect } from './config/browserTest';
 
 it.describe('mobile viewport', () => {
   it.beforeEach(async ({ browserName }) => {

tests/browsercontext-viewport.spec.ts

@@ -16,7 +16,7 @@
  */
 
 import { test as it, expect } from './config/pageTest';
-import { test as browserTest } from './config/browserTest';
+import { browserTest } from './config/browserTest';
 import { verifyViewport } from './config/utils';
 
 it.beforeEach(async ({ isElectron, isAndroid }) => {

tests/browsertype-basic.spec.ts

@@ -16,7 +16,7 @@
  */
 
 import fs from 'fs';
-import { test, expect } from './config/playwrightTest';
+import { playwrightTest as test, expect } from './config/browserTest';
 
 test('browserType.executablePath should work', async ({ browserType, browserChannel, browserOptions }) => {
   test.skip(!!browserChannel, 'We skip browser download when testing a channel');

tests/browsertype-connect.spec.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { slowTest as test, expect } from './config/playwrightTest';
+import { slowPlaywrightTest as test, expect } from './config/browserTest';
 import fs from 'fs';
 import * as path from 'path';
 

tests/browsertype-launch-server.spec.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { test as it, expect } from './config/playwrightTest';
+import { playwrightTest as it, expect } from './config/browserTest';
 
 it.describe('launch server', () => {
   it.beforeEach(async ({ mode}) => {
@@ -45,7 +45,7 @@ it.describe('launch server', () => {
   it('should fire "close" event during kill', async ({browserType, browserOptions}) => {
     const order = [];
     const browserServer = await browserType.launchServer(browserOptions);
-    const closedPromise = new Promise(f => browserServer.on('close', () => {
+    const closedPromise = new Promise<void>(f => browserServer.on('close', () => {
       order.push('closed');
       f();
     }));

tests/browsertype-launch.spec.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { test as it, slowTest, expect } from './config/playwrightTest';
+import { playwrightTest as it, slowPlaywrightTest as slowTest, expect } from './config/browserTest';
 
 it('should reject all promises when browser is closed', async ({browserType, browserOptions}) => {
   const browser = await browserType.launch(browserOptions);

tests/capabilities.spec.ts

@@ -16,7 +16,7 @@
 
 import os from 'os';
 import url from 'url';
-import { test as it, expect } from './config/contextTest';
+import { contextTest as it, expect } from './config/browserTest';
 
 it('Web Assembly should work', async function({page, server, browserName, platform}) {
   it.fail(browserName === 'webkit' && platform === 'win32');

tests/channels.spec.ts

@@ -16,7 +16,7 @@
  */
 
 import domain from 'domain';
-import { test as it, expect } from './config/playwrightTest';
+import { playwrightTest as it, expect } from './config/browserTest';
 
 it('should scope context handles', async ({browserType, browserOptions, server}) => {
   const browser = await browserType.launch(browserOptions);

tests/chromium/chromium.spec.ts

@@ -16,7 +16,7 @@
  */
 
 import { test as pageTest, expect } from '../config/pageTest';
-import { test as playwrightTest } from '../config/playwrightTest';
+import { playwrightTest } from '../config/browserTest';
 import http from 'http';
 
 pageTest.describe('chromium', () => {

tests/chromium/launcher.spec.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { test as it, expect } from '../config/playwrightTest';
+import { playwrightTest as it, expect } from '../config/browserTest';
 
 it.beforeEach(async ({ browserName }) => {
   it.skip(browserName !== 'chromium');

tests/chromium/oopif.spec.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { test as it, expect } from '../config/playwrightTest';
+import { playwrightTest as it, expect } from '../config/browserTest';
 import type { Browser, Page } from '../../index';
 
 it.describe('oopif', () => {