test: move remaining tests to jest (#3009)

Author: pavelfeldman

test/chromium/chromium.spec.js renamed to test/chromium/chromium.jest.js

@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-const {FFOX, CHROMIUM, WEBKIT, CHANNEL} = require('../utils').testOptions(browserType);
+const {FFOX, CHROMIUM, WEBKIT, CHANNEL} = testOptions;
 
-describe('Service Worker', function() {
-  it('should create a worker from a service worker', async({browser, page, server, context}) => {
+describe.skip(!CHROMIUM)('Service Worker', function() {
+  it('should create a worker from a service worker', async({page, server, context}) => {
     const [worker] = await Promise.all([
       context.waitForEvent('serviceworker'),
       page.goto(server.PREFIX + '/serviceworkers/empty/sw.html')
     ]);
     expect(await worker.evaluate(() => self.toString())).toBe('[object ServiceWorkerGlobalScope]');
   });
-  it('serviceWorkers() should return current workers', async({browser, page, server, context}) => {
+  it('serviceWorkers() should return current workers', async({page, server, context}) => {
     const [worker1] = await Promise.all([
       context.waitForEvent('serviceworker'),
       page.goto(server.PREFIX + '/serviceworkers/empty/sw.html')
@@ -41,7 +41,7 @@ describe('Service Worker', function() {
     expect(workers).toContain(worker1);
     expect(workers).toContain(worker2);
   });
-  it('should not create a worker from a shared worker', async({browser, page, server, context}) => {
+  it('should not create a worker from a shared worker', async({page, server, context}) => {
     await page.goto(server.EMPTY_PAGE);
     let serviceWorkerCreated;
     context.once('serviceworker', () => serviceWorkerCreated = true);
@@ -65,7 +65,7 @@ describe('Service Worker', function() {
   });
 });
 
-describe('Chromium-Specific Page Tests', function() {
+describe.skip(!CHROMIUM)('Chromium-Specific Page Tests', function() {
   it('Page.route should work with intervention headers', async({server, page}) => {
     server.setRoute('/intervention', (req, res) => res.end(`
       <script>

test/chromium/launcher.spec.js renamed to test/chromium/launcher.jest.js

@@ -17,9 +17,9 @@
 const path = require('path');
 const utils = require('../utils');
 const {makeUserDataDir, removeUserDataDir} = utils;
-const {FFOX, CHROMIUM, WEBKIT, WIN, USES_HOOKS} = utils.testOptions(browserType);
+const {FFOX, CHROMIUM, WEBKIT, WIN, USES_HOOKS} = testOptions;
 
-describe('launcher', function() {
+describe.skip(!CHROMIUM)('launcher', function() {
   it('should throw with remote-debugging-pipe argument', async({browserType, defaultBrowserOptions}) => {
     const options = Object.assign({}, defaultBrowserOptions);
     options.args = ['--remote-debugging-pipe'].concat(options.args || []);
@@ -49,7 +49,7 @@ describe('launcher', function() {
   });
 });
 
-describe('extensions', () => {
+describe.skip(!CHROMIUM)('extensions', () => {
   it('should return background pages', async({browserType, defaultBrowserOptions}) => {
     const userDataDir = await makeUserDataDir();
     const extensionPath = path.join(__dirname, '..', 'assets', 'simple-extension');
@@ -73,7 +73,7 @@ describe('extensions', () => {
   });
 });
 
-describe('BrowserContext', function() {
+describe.skip(!CHROMIUM)('BrowserContext', function() {
   it('should not create pages automatically', async ({browserType, defaultBrowserOptions}) => {
     const browser = await browserType.launch(defaultBrowserOptions);
     const browserSession = await browser.newBrowserCDPSession();

test/chromium/oopif.spec.js renamed to test/chromium/oopif.jest.js

@@ -14,34 +14,47 @@
  * limitations under the License.
  */
 
-const {FFOX, CHROMIUM, WEBKIT, CHANNEL} = require('../utils').testOptions(browserType);
+const {FFOX, CHROMIUM, WEBKIT, CHANNEL} = testOptions;
 
-describe('OOPIF', function() {
-  beforeAll(async function(state) {
-    state.browser = await state.browserType.launch(Object.assign({}, state.defaultBrowserOptions, {
-      args: (state.defaultBrowserOptions.args || []).concat(['--site-per-process']),
-    }));
+registerFixture('sppBrowser', async ({browserType, defaultBrowserOptions}, test) => {
+  const browser = await browserType.launch({
+    ...defaultBrowserOptions,
+    args: (defaultBrowserOptions.args || []).concat(['--site-per-process'])
   });
-  beforeEach(async function(state) {
-    state.context = await state.browser.newContext();
-    state.page = await state.context.newPage();
-  });
-  afterEach(async function(state) {
-    await state.context.close();
-    state.page = null;
-    state.context = null;
-  });
-  afterAll(async function(state) {
-    await state.browser.close();
-    state.browser = null;
-  });
-  it('should report oopif frames', async function({browser, page, server, context}) {
+  try {
+    await test(browser);
+  } finally {
+    await browser.close();
+  }
+});
+
+registerFixture('sppContext', async ({sppBrowser}, test) => {
+  const context = await sppBrowser.newContext();
+  try {
+    await test(context);
+  } finally {
+    await context.close();
+  }
+});
+
+registerFixture('sppPage', async ({sppContext}, test) => {
+  const page = await sppContext.newPage();
+  await test(page);
+});
+
+
+describe.skip(!CHROMIUM)('OOPIF', function() {
+  it('should report oopif frames', async function({sppBrowser, sppPage, server}) {
+    const browser = sppBrowser;
+    const page = sppPage;
     await page.goto(server.PREFIX + '/dynamic-oopif.html');
     expect(await countOOPIFs(browser)).toBe(1);
     expect(page.frames().length).toBe(2);
     expect(await page.frames()[1].evaluate(() => '' + location.href)).toBe(server.CROSS_PROCESS_PREFIX + '/grid.html');
   });
-  it('should handle oopif detach', async function({browser, page, server, context}) {
+  it('should handle oopif detach', async function({sppBrowser, sppPage, server}) {
+    const browser = sppBrowser;
+    const page = sppPage;
     await page.goto(server.PREFIX + '/dynamic-oopif.html');
     expect(await countOOPIFs(browser)).toBe(1);
     expect(page.frames().length).toBe(2);
@@ -53,7 +66,9 @@ describe('OOPIF', function() {
     ]);
     expect(detachedFrame).toBe(frame);
   });
-  it('should handle remote -> local -> remote transitions', async function({browser, page, server, context}) {
+  it('should handle remote -> local -> remote transitions', async function({sppBrowser, sppPage, server}) {
+    const browser = sppBrowser;
+    const page = sppPage;
     await page.goto(server.PREFIX + '/dynamic-oopif.html');
     expect(page.frames().length).toBe(2);
     expect(await countOOPIFs(browser)).toBe(1);
@@ -71,7 +86,9 @@ describe('OOPIF', function() {
     expect(await page.frames()[1].evaluate(() => '' + location.href)).toBe(server.CROSS_PROCESS_PREFIX + '/grid.html');
     expect(await countOOPIFs(browser)).toBe(1);
   });
-  it.fail(CHROMIUM)('should get the proper viewport', async({browser, page, server}) => {
+  it.fail(true)('should get the proper viewport', async({sppBrowser, sppPage, server}) => {
+    const browser = sppBrowser;
+    const page = sppPage;
     expect(page.viewportSize()).toEqual({width: 1280, height: 720});
     await page.goto(server.PREFIX + '/dynamic-oopif.html');
     expect(page.frames().length).toBe(2);
@@ -89,7 +106,9 @@ describe('OOPIF', function() {
     expect(await oopif.evaluate(() => matchMedia('(device-height: 456px)').matches)).toBe(true);
     expect(await oopif.evaluate(() => 'ontouchstart' in window)).toBe(false);
   });
-  it('should expose function', async({browser, page, server}) => {
+  it('should expose function', async({sppBrowser, sppPage, server}) => {
+    const browser = sppBrowser;
+    const page = sppPage;
     await page.goto(server.PREFIX + '/dynamic-oopif.html');
     expect(page.frames().length).toBe(2);
     expect(await countOOPIFs(browser)).toBe(1);
@@ -100,7 +119,9 @@ describe('OOPIF', function() {
     });
     expect(result).toBe(36);
   });
-  it('should emulate media', async({browser, page, server}) => {
+  it('should emulate media', async({sppBrowser, sppPage, server}) => {
+    const browser = sppBrowser;
+    const page = sppPage;
     await page.goto(server.PREFIX + '/dynamic-oopif.html');
     expect(page.frames().length).toBe(2);
     expect(await countOOPIFs(browser)).toBe(1);
@@ -109,7 +130,10 @@ describe('OOPIF', function() {
     await page.emulateMedia({ colorScheme: 'dark' });
     expect(await oopif.evaluate(() => matchMedia('(prefers-color-scheme: dark)').matches)).toBe(true);
   });
-  it('should emulate offline', async({browser, page, context, server}) => {
+  it('should emulate offline', async({sppBrowser, sppPage, sppContext, server}) => {
+    const browser = sppBrowser;
+    const context = sppContext;
+    const page = sppPage;
     await page.goto(server.PREFIX + '/dynamic-oopif.html');
     expect(page.frames().length).toBe(2);
     expect(await countOOPIFs(browser)).toBe(1);
@@ -118,7 +142,8 @@ describe('OOPIF', function() {
     await context.setOffline(true);
     expect(await oopif.evaluate(() => navigator.onLine)).toBe(false);
   });
-  it('should support context options', async({browser, server}) => {
+  it('should support context options', async({sppBrowser, server, playwright}) => {
+    const browser = sppBrowser;
     const iPhone = playwright.devices['iPhone 6']
     const context = await browser.newContext({ ...iPhone, timezoneId: 'America/Jamaica', locale: 'fr-CH', userAgent: 'UA' });
     const page = await context.newPage();
@@ -139,7 +164,9 @@ describe('OOPIF', function() {
 
     await context.close();
   });
-  it('should respect route', async({browser, page, server}) => {
+  it('should respect route', async({sppBrowser, sppPage, server}) => {
+    const browser = sppBrowser;
+    const page = sppPage;
     let intercepted = false;
     await page.route('**/digits/0.png', route => {
       intercepted = true;
@@ -150,19 +177,25 @@ describe('OOPIF', function() {
     expect(await countOOPIFs(browser)).toBe(1);
     expect(intercepted).toBe(true);
   });
-  it('should take screenshot', async({browser, page, server, golden}) => {
+  it('should take screenshot', async({sppBrowser, sppPage, server}) => {
+    const browser = sppBrowser;
+    const page = sppPage;
     await page.setViewportSize({width: 500, height: 500});
     await page.goto(server.PREFIX + '/dynamic-oopif.html');
     expect(page.frames().length).toBe(2);
     expect(await countOOPIFs(browser)).toBe(1);
-    expect(await page.screenshot()).toBeGolden(golden('screenshot-oopif.png'));
+    expect(await page.screenshot()).toBeGolden('screenshot-oopif.png');
   });
-  it('should load oopif iframes with subresources and request interception', async function({browser, page, server, context}) {
+  it('should load oopif iframes with subresources and request interception', async function({sppBrowser, sppPage, server, context}) {
+    const browser = sppBrowser;
+    const page = sppPage;
     await page.route('**/*', route => route.continue());
     await page.goto(server.PREFIX + '/dynamic-oopif.html');
     expect(await countOOPIFs(browser)).toBe(1);
   });
-  it('should report main requests', async function({browser, page, server, context}) {
+  it('should report main requests', async function({sppBrowser, sppPage, server}) {
+    const browser = sppBrowser;
+    const page = sppPage;
     const requestFrames = [];
     page.on('request', r => requestFrames.push(r.frame()));
     const finishedFrames = [];
@@ -199,7 +232,10 @@ describe('OOPIF', function() {
     expect(requestFrames[2]).toBe(grandChild);
     expect(finishedFrames[2]).toBe(grandChild);
   });
-  it('should support exposeFunction', async function({browser, page, server, context}) {
+  it('should support exposeFunction', async function({sppBrowser, sppContext, sppPage, server}) {
+    const browser = sppBrowser;
+    const context = sppContext;
+    const page = sppPage;
     await context.exposeFunction('dec', a => a - 1);
     await page.exposeFunction('inc', a => a + 1);
     await page.goto(server.PREFIX + '/dynamic-oopif.html');
@@ -210,7 +246,10 @@ describe('OOPIF', function() {
     expect(await page.frames()[0].evaluate(() => dec(3))).toBe(2);
     expect(await page.frames()[1].evaluate(() => dec(4))).toBe(3);
   });
-  it('should support addInitScript', async function({browser, page, server, context}) {
+  it('should support addInitScript', async function({sppBrowser, sppContext, sppPage, server}) {
+    const browser = sppBrowser;
+    const context = sppContext;
+    const page = sppPage;
     await context.addInitScript(() => window.bar = 17);
     await page.addInitScript(() => window.foo = 42);
     await page.goto(server.PREFIX + '/dynamic-oopif.html');
@@ -222,7 +261,9 @@ describe('OOPIF', function() {
     expect(await page.frames()[1].evaluate(() => window.bar)).toBe(17);
   });
   // @see https://github.com/microsoft/playwright/issues/1240
-  it('should click a button when it overlays oopif', async function({browser, page, server, context}) {
+  it('should click a button when it overlays oopif', async function({sppBrowser, sppPage, server}) {
+    const browser = sppBrowser;
+    const page = sppPage;
     await page.goto(server.PREFIX + '/button-overlay-oopif.html');
     expect(await countOOPIFs(browser)).toBe(1);
     await page.click('button');

test/chromium/session.spec.js renamed to test/chromium/session.jest.js

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-const {FFOX, CHROMIUM, WEBKIT, CHANNEL, USES_HOOKS} = require('../utils').testOptions(browserType);
+const {FFOX, CHROMIUM, WEBKIT, CHANNEL, USES_HOOKS} = testOptions;
 
-describe('ChromiumBrowserContext.createSession', function() {
-  it('should work', async function({page, browser, server}) {
+describe.skip(!CHROMIUM)('ChromiumBrowserContext.createSession', function() {
+  it('should work', async function({page}) {
     const client = await page.context().newCDPSession(page);
 
     await Promise.all([
@@ -27,15 +27,15 @@ describe('ChromiumBrowserContext.createSession', function() {
     const foo = await page.evaluate(() => window.foo);
     expect(foo).toBe('bar');
   });
-  it('should send events', async function({page, browser, server}) {
+  it('should send events', async function({page, server}) {
     const client = await page.context().newCDPSession(page);
     await client.send('Network.enable');
     const events = [];
     client.on('Network.requestWillBeSent', event => events.push(event));
     await page.goto(server.EMPTY_PAGE);
     expect(events.length).toBe(1);
   });
-  it('should enable and disable domains independently', async function({page, browser, server}) {
+  it('should enable and disable domains independently', async function({page}) {
     const client = await page.context().newCDPSession(page);
     await client.send('Runtime.enable');
     await client.send('Debugger.enable');
@@ -52,7 +52,7 @@ describe('ChromiumBrowserContext.createSession', function() {
       page.evaluate('//# sourceURL=foo.js')
     ]);
   });
-  it('should be able to detach session', async function({page, browser, server}) {
+  it('should be able to detach session', async function({page}) {
     const client = await page.context().newCDPSession(page);
     await client.send('Runtime.enable');
     const evalResponse = await client.send('Runtime.evaluate', {expression: '1 + 2', returnByValue: true});
@@ -66,7 +66,7 @@ describe('ChromiumBrowserContext.createSession', function() {
     }
     expect(error.message).toContain(CHANNEL ? 'Target browser or context has been closed' : 'Session closed.');
   });
-  it('should throw nice errors', async function({page, browser}) {
+  it('should throw nice errors', async function({page}) {
     const client = await page.context().newCDPSession(page);
     const error = await theSourceOfTheProblems().catch(error => error);
     expect(error.stack).toContain('theSourceOfTheProblems');
@@ -76,27 +76,27 @@ describe('ChromiumBrowserContext.createSession', function() {
       await client.send('ThisCommand.DoesNotExist');
     }
   });
-  it('should not break page.close()', async function({browser, server}) {
+  it('should not break page.close()', async function({browser}) {
     const context = await browser.newContext();
     const page = await context.newPage();
     const session = await page.context().newCDPSession(page);
     await session.detach();
     await page.close();
     await context.close();
   });
-  it('should detach when page closes', async function({browser, server}) {
+  it('should detach when page closes', async function({browser}) {
     const context = await browser.newContext();
     const page = await context.newPage();
     const session = await context.newCDPSession(page);
     await page.close();
     let error;
     await session.detach().catch(e => error = e);
-    expect(error).toBeTruthy('Calling detach on a closed page\'s session should throw');
+    expect(error).toBeTruthy();
     await context.close();
   });
 });
-describe('ChromiumBrowser.newBrowserCDPSession', function() {
-  it('should work', async function({page, browser, server}) {
+describe.skip(!CHROMIUM)('ChromiumBrowser.newBrowserCDPSession', function() {
+  it('should work', async function({browser}) {
     const session = await browser.newBrowserCDPSession();
 
     const version = await session.send('Browser.getVersion');