microsoft · dgozman · Apr 2, 2021 · Apr 2, 2021
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -277,11 +277,7 @@ jobs:
     - name: Start Android Emulator
       run: utils/avd_start.sh
     - name: Run tests
-      run: npm run build-folio && node tests/folio/cli.js --config=tests/config/android.config.ts
-      env:
-        FOLIO_JSON_OUTPUT_NAME: "test-results/report-new.json"
-    - name: Run page tests
-      run: npx folio test/page -p browserName=chromium --workers=1 --forbid-only --timeout=120000 --global-timeout=5400000 --retries=3 --reporter=dot,json
+      run: npm run build-folio && node tests/folio/cli.js --config=tests/config/android.config.ts --reporter=dot,json
     - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json
       if: always() && github.repository == 'microsoft/playwright' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-'))
     - uses: actions/upload-artifact@v1

diff --git a/test/browsercontext-set-extra-http-headers.spec.ts b/test/browsercontext-set-extra-http-headers.spec.ts
@@ -33,3 +33,8 @@ it('should override extra headers from browser context', async ({browser, server
   expect(request.headers['foo']).toBe('Bar');
   expect(request.headers['bar']).toBe('foO');
 });
+
+it('should throw for non-string header values', async ({browser}) => {
+  const error3 = await browser.newContext({ extraHTTPHeaders: { 'foo': null } }).catch(e => e);
+  expect(error3.message).toContain('Expected value of header "foo" to be String, but "object" is found.');
+});
diff --git a/test/page/README.md b/test/page/README.md
diff --git a/tests/config/androidEnv.ts b/tests/config/androidEnv.ts
@@ -41,6 +41,8 @@ export class AndroidEnv implements Env<AndroidTestArgs> {
       isChromium: true,
       isFirefox: false,
       isWebKit: false,
+      browserName: 'chromium' as const,
+      browserChannel: undefined,
       isWindows: os.platform() === 'win32',
       isMac: os.platform() === 'darwin',
       isLinux: os.platform() === 'linux',

diff --git a/tests/config/pageTest.ts b/tests/config/pageTest.ts
@@ -26,6 +26,8 @@ export type CommonTestArgs = {
 
   playwright: typeof import('../../index');
   toImpl: (rpcObject: any) => any;
+  browserName: 'chromium' | 'firefox' | 'webkit';
+  browserChannel: string | undefined;
 
   isChromium: boolean;
   isFirefox: boolean;

diff --git a/tests/config/playwrightTest.ts b/tests/config/playwrightTest.ts
@@ -22,9 +22,7 @@ import { RemoteServer, RemoteServerOptions } from './remoteServer';
 export { expect } from 'folio';
 
 export type PlaywrightTestArgs = CommonTestArgs & {
-  browserName: 'chromium' | 'firefox' | 'webkit';
   browserType: BrowserType<Browser>;
-  browserChannel: string | undefined;
   browserOptions: LaunchOptions;
   headful: boolean;
   createUserDataDir: () => Promise<string>;

diff --git a/test/page/elementhandle-click.spec.ts → tests/elementhandle-click.spec.ts b/test/page/elementhandle-click.spec.ts → tests/elementhandle-click.spec.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { it, expect } from '../fixtures';
+import { test as it, expect } from './config/pageTest';
 
 it('should work', async ({ page, server }) => {
   await page.goto(server.PREFIX + '/input/button.html');

diff --git a/.../page/elementhandle-content-frame.spec.ts → tests/elementhandle-content-frame.spec.ts b/.../page/elementhandle-content-frame.spec.ts → tests/elementhandle-content-frame.spec.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import { it, expect } from '../fixtures';
-import { attachFrame } from '../utils';
+import { test as it, expect } from './config/pageTest';
+import { attachFrame } from '../test/utils';
 
 it('should work', async ({ page, server }) => {
   await page.goto(server.EMPTY_PAGE);

diff --git a/test/page/elementhandle-convenience.spec.ts → tests/elementhandle-convenience.spec.ts b/test/page/elementhandle-convenience.spec.ts → tests/elementhandle-convenience.spec.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { it, expect } from '../fixtures';
+import { test as it, expect } from './config/pageTest';
 
 it('should have a nice preview', async ({ page, server }) => {
   await page.goto(`${server.PREFIX}/dom.html`);

diff --git a/...ge/elementhandle-eval-on-selector.spec.ts → tests/elementhandle-eval-on-selector.spec.ts b/...ge/elementhandle-eval-on-selector.spec.ts → tests/elementhandle-eval-on-selector.spec.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { it, expect } from '../fixtures';
+import { test as it, expect } from './config/pageTest';
 
 it('should work', async ({page, server}) => {
   await page.setContent('<html><body><div class="tweet"><div class="like">100</div><div class="retweets">10</div></div></body></html>');

diff --git a/test/page/elementhandle-misc.spec.ts → tests/elementhandle-misc.spec.ts b/test/page/elementhandle-misc.spec.ts → tests/elementhandle-misc.spec.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { it, expect } from '../fixtures';
+import { test as it, expect } from './config/pageTest';
 
 it('should hover', async ({ page, server }) => {
   await page.goto(server.PREFIX + '/input/scrollable.html');

diff --git a/test/page/elementhandle-owner-frame.spec.ts → tests/elementhandle-owner-frame.spec.ts b/test/page/elementhandle-owner-frame.spec.ts → tests/elementhandle-owner-frame.spec.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import { it, expect } from '../fixtures';
-import { attachFrame } from '../utils';
+import { test as it, expect } from './config/pageTest';
+import { attachFrame } from '../test/utils';
 
 it('should work', async ({ page, server }) => {
   await page.goto(server.EMPTY_PAGE);

diff --git a/test/page/elementhandle-press.spec.ts → tests/elementhandle-press.spec.ts b/test/page/elementhandle-press.spec.ts → tests/elementhandle-press.spec.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { it, expect } from '../fixtures';
+import { test as it, expect } from './config/pageTest';
 
 it('should work', async ({ page }) => {
   await page.setContent(`<input type='text' />`);

diff --git a/...page/elementhandle-query-selector.spec.ts → tests/elementhandle-query-selector.spec.ts b/...page/elementhandle-query-selector.spec.ts → tests/elementhandle-query-selector.spec.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { it, expect } from '../fixtures';
+import { test as it, expect } from './config/pageTest';
 
 it('should query existing element', async ({page, server}) => {
   await page.goto(server.PREFIX + '/playground.html');

diff --git a/...ge/elementhandle-scroll-into-view.spec.ts → tests/elementhandle-scroll-into-view.spec.ts b/...ge/elementhandle-scroll-into-view.spec.ts → tests/elementhandle-scroll-into-view.spec.ts
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-import { it, expect } from '../fixtures';
+import { test as it, expect } from './config/pageTest';
+
+it('should work', async ({ page, server }) => {
+  it.fixme(process.env.PW_ANDROID_TESTS);
 
-it('should work', test => {
-  test.fixme(process.env.PW_ANDROID_TESTS);
-}, async ({ page, server }) => {
   await page.goto(server.PREFIX + '/offscreenbuttons.html');
   for (let i = 0; i < 11; ++i) {
     const button = await page.$('#btn' + i);

diff --git a/test/page/elementhandle-select-text.spec.ts → tests/elementhandle-select-text.spec.ts b/test/page/elementhandle-select-text.spec.ts → tests/elementhandle-select-text.spec.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { it, expect } from '../fixtures';
+import { test as it, expect } from './config/pageTest';
 
 it('should select textarea', async ({ page, server, isFirefox }) => {
   await page.goto(server.PREFIX + '/input/textarea.html');

diff --git a/test/page/elementhandle-type.spec.ts → tests/elementhandle-type.spec.ts b/test/page/elementhandle-type.spec.ts → tests/elementhandle-type.spec.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { it, expect } from '../fixtures';
+import { test as it, expect } from './config/pageTest';
 
 it('should work', async ({ page }) => {
   await page.setContent(`<input type='text' />`);

diff --git a/...menthandle-wait-for-element-state.spec.ts → ...menthandle-wait-for-element-state.spec.ts b/...menthandle-wait-for-element-state.spec.ts → ...menthandle-wait-for-element-state.spec.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { it, expect } from '../fixtures';
+import { test as it, expect } from './config/pageTest';
 
 async function giveItAChanceToResolve(page) {
   for (let i = 0; i < 5; i++)
@@ -114,9 +114,9 @@ it('should wait for disabled button', async ({page}) => {
   await promise;
 });
 
-it('should wait for stable position', (test, { browserName, platform }) => {
-  test.fixme(browserName === 'firefox' && platform === 'linux');
-}, async ({page, server}) => {
+it('should wait for stable position', async ({page, server, isFirefox, platform}) => {
+  it.fixme(isFirefox && platform === 'linux');
+
   await page.goto(server.PREFIX + '/input/button.html');
   const button = await page.$('button');
   await page.$eval('button', button => {

diff --git a/test/page/eval-on-selector-all.spec.ts → tests/eval-on-selector-all.spec.ts b/test/page/eval-on-selector-all.spec.ts → tests/eval-on-selector-all.spec.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { it, expect } from '../fixtures';
+import { test as it, expect } from './config/pageTest';
 
 it('should work with css selector', async ({page, server}) => {
   await page.setContent('<div>hello</div><div>beautiful</div><div>world!</div>');

diff --git a/test/page/eval-on-selector.spec.ts → tests/eval-on-selector.spec.ts b/test/page/eval-on-selector.spec.ts → tests/eval-on-selector.spec.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { it, expect } from '../fixtures';
+import { test as it, expect } from './config/pageTest';
 
 it('should work with css selector', async ({page, server}) => {
   await page.setContent('<section id="testAttribute">43543</section>');

diff --git a/test/page/jshandle-evaluate.spec.ts → tests/jshandle-evaluate.spec.ts b/test/page/jshandle-evaluate.spec.ts → tests/jshandle-evaluate.spec.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { it, expect } from '../fixtures';
+import { test as it, expect } from './config/pageTest';
 
 it('should work with function', async ({page}) => {
   const windowHandle = await page.evaluateHandle(() => {

diff --git a/test/page/jshandle-json-value.spec.ts → tests/jshandle-json-value.spec.ts b/test/page/jshandle-json-value.spec.ts → tests/jshandle-json-value.spec.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { it, expect } from '../fixtures';
+import { test as it, expect } from './config/pageTest';
 
 it('should work', async ({page}) => {
   const aHandle = await page.evaluateHandle(() => ({foo: 'bar'}));

diff --git a/test/page/jshandle-properties.spec.ts → tests/jshandle-properties.spec.ts b/test/page/jshandle-properties.spec.ts → tests/jshandle-properties.spec.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import { it, expect } from '../fixtures';
-import type { ElementHandle } from '../..';
+import { test as it, expect } from './config/pageTest';
+import type { ElementHandle } from '../index';
 
 it('should work', async ({page}) => {
   const aHandle = await page.evaluateHandle(() => ({

diff --git a/test/page/jshandle-to-string.spec.ts → tests/jshandle-to-string.spec.ts b/test/page/jshandle-to-string.spec.ts → tests/jshandle-to-string.spec.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { it, expect } from '../fixtures';
+import { test as it, expect } from './config/pageTest';
 
 it('should work for primitives', async ({page}) => {
   const numberHandle = await page.evaluateHandle(() => 2);

diff --git a/test/page/page-add-init-script.spec.ts → tests/page-add-init-script.spec.ts b/test/page/page-add-init-script.spec.ts → tests/page-add-init-script.spec.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { it, expect } from '../fixtures';
+import { test as it, expect } from './config/pageTest';
 import path from 'path';
 
 it('should evaluate before anything else on the page', async ({ page, server }) => {
@@ -27,7 +27,7 @@ it('should evaluate before anything else on the page', async ({ page, server })
 });
 
 it('should work with a path', async ({ page, server }) => {
-  await page.addInitScript({ path: path.join(__dirname, '../assets/injectedfile.js') });
+  await page.addInitScript({ path: path.join(__dirname, '../test/assets/injectedfile.js') });
   await page.goto(server.PREFIX + '/tamperable.html');
   expect(await page.evaluate(() => window['result'])).toBe(123);
 });

diff --git a/test/page/page-add-script-tag.spec.ts → tests/page-add-script-tag.spec.ts b/test/page/page-add-script-tag.spec.ts → tests/page-add-script-tag.spec.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { it, expect } from '../fixtures';
+import { test as it, expect } from './config/pageTest';
 import path from 'path';
 
 it('should throw an error if no options are provided', async ({page, server}) => {
@@ -44,7 +44,7 @@ it('should work with a url and type=module', async ({page, server}) => {
 
 it('should work with a path and type=module', async ({page, server}) => {
   await page.goto(server.EMPTY_PAGE);
-  await page.addScriptTag({ path: path.join(__dirname, '../assets/es6/es6pathimport.js'), type: 'module' });
+  await page.addScriptTag({ path: path.join(__dirname, '../test/assets/es6/es6pathimport.js'), type: 'module' });
   await page.waitForFunction('window.__es6injected');
   expect(await page.evaluate(() => window['__es6injected'])).toBe(42);
 });
@@ -69,16 +69,16 @@ it('should throw an error if loading from url fail', async ({page, server}) => {
 
 it('should work with a path', async ({page, server}) => {
   await page.goto(server.EMPTY_PAGE);
-  const scriptHandle = await page.addScriptTag({ path: path.join(__dirname, '../assets/injectedfile.js') });
+  const scriptHandle = await page.addScriptTag({ path: path.join(__dirname, '../test/assets/injectedfile.js') });
   expect(scriptHandle.asElement()).not.toBeNull();
   expect(await page.evaluate(() => window['__injected'])).toBe(42);
 });
 
-it('should include sourceURL when path is provided', (test, { browserName }) => {
-  test.skip(browserName === 'webkit');
-}, async ({page, server}) => {
+it('should include sourceURL when path is provided', async ({page, server, isWebKit}) => {
+  it.skip(isWebKit);
+
   await page.goto(server.EMPTY_PAGE);
-  await page.addScriptTag({ path: path.join(__dirname, '../assets/injectedfile.js') });
+  await page.addScriptTag({ path: path.join(__dirname, '../test/assets/injectedfile.js') });
   const result = await page.evaluate(() => window['__injectedError'].stack);
   expect(result).toContain(path.join('assets', 'injectedfile.js'));
 });
@@ -98,9 +98,9 @@ it('should throw when added with content to the CSP page', async ({page, server}
   expect(error).toBeTruthy();
 });
 
-it('should throw when added with URL to the CSP page', test => {
-  test.skip(process.env.PW_ANDROID_TESTS);
-}, async ({page, server}) => {
+it('should throw when added with URL to the CSP page', async ({page, server}) => {
+  it.skip(process.env.PW_ANDROID_TESTS);
+
   await page.goto(server.PREFIX + '/csp.html');
   let error = null;
   await page.addScriptTag({ url: server.CROSS_PROCESS_PREFIX + '/injectedfile.js' }).catch(e => error = e);

diff --git a/test/page/page-add-style-tag.spec.ts → tests/page-add-style-tag.spec.ts b/test/page/page-add-style-tag.spec.ts → tests/page-add-style-tag.spec.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { it, expect } from '../fixtures';
+import { test as it, expect } from './config/pageTest';
 import path from 'path';
 
 it('should throw an error if no options are provided', async ({page, server}) => {
@@ -49,14 +49,14 @@ it('should throw an error if loading from url fail', async ({page, server}) => {
 
 it('should work with a path', async ({page, server}) => {
   await page.goto(server.EMPTY_PAGE);
-  const styleHandle = await page.addStyleTag({ path: path.join(__dirname, '../assets/injectedstyle.css') });
+  const styleHandle = await page.addStyleTag({ path: path.join(__dirname, '../test/assets/injectedstyle.css') });
   expect(styleHandle.asElement()).not.toBeNull();
   expect(await page.evaluate(`window.getComputedStyle(document.querySelector('body')).getPropertyValue('background-color')`)).toBe('rgb(255, 0, 0)');
 });
 
 it('should include sourceURL when path is provided', async ({page, server}) => {
   await page.goto(server.EMPTY_PAGE);
-  await page.addStyleTag({ path: path.join(__dirname, '../assets/injectedstyle.css') });
+  await page.addStyleTag({ path: path.join(__dirname, '../test/assets/injectedstyle.css') });
   const styleHandle = await page.$('style');
   const styleContent = await page.evaluate(style => style.innerHTML, styleHandle);
   expect(styleContent).toContain(path.join('assets', 'injectedstyle.css'));
@@ -76,9 +76,9 @@ it('should throw when added with content to the CSP page', async ({page, server}
   expect(error).toBeTruthy();
 });
 
-it('should throw when added with URL to the CSP page', test => {
-  test.skip(process.env.PW_ANDROID_TESTS);
-}, async ({page, server}) => {
+it('should throw when added with URL to the CSP page', async ({page, server}) => {
+  it.skip(process.env.PW_ANDROID_TESTS);
+
   await page.goto(server.PREFIX + '/csp.html');
   let error = null;
   await page.addStyleTag({ url: server.CROSS_PROCESS_PREFIX + '/injectedstyle.css' }).catch(e => error = e);

diff --git a/test/page/page-check.spec.ts → tests/page-check.spec.ts b/test/page/page-check.spec.ts → tests/page-check.spec.ts
@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { it, expect } from '../fixtures';
+
+import { test as it, expect } from './config/pageTest';
 
 it('should check the box', async ({page}) => {
   await page.setContent(`<input id='checkbox' type='checkbox'></input>`);