test(KTL-1189); fix "Page closed" for github_mac

JetBrains · Aug 20, 2023 · b38ab7f · b38ab7f
1 parent df42131
commit b38ab7f
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 33 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -81,6 +81,5 @@ jobs:
           path: |
             test-results/
             playwright-report/
-            tests/**/__screenshots__
-            !tests/**/__screenshots__/dev
+            tests/**/__screenshots__/github_*
           retention-days: 5
diff --git a/playwright.config.ts b/playwright.config.ts
@@ -5,17 +5,17 @@ import { defineConfig, devices } from '@playwright/test';
 dotenv({ path: `.env.local`, override: true });
 
 const PROJECTS_LIST = {
-  DEV: [ 'Desktop Chrome' ],
-  GITHUB_MAC: [ 'Desktop Safari' ],
-  GITHUB_LINUX: [ 'Desktop Chrome', 'Desktop Firefox' ],
+  DEV: ['Desktop Chrome'],
+  GITHUB_MAC: ['Desktop Safari'],
+  GITHUB_LINUX: ['Desktop Chrome', 'Desktop Firefox'],
 };
 
 const envMode = (env.TEST_PROJECT_LIST || 'DEV').toUpperCase();
 
 if (!(envMode && isKeyOfObject(envMode, PROJECTS_LIST))) {
   const list = Object.keys(PROJECTS_LIST)
-      .map((s) => `'${s.toLowerCase()}'`)
-      .join(' or ');
+    .map((s) => `'${s.toLowerCase()}'`)
+    .join(' or ');
 
   throw Error(`TEST_PROJECT_LIST should be ${list}`);
 }
@@ -28,7 +28,7 @@ export default defineConfig({
   testMatch: /.*\.e2e\.tsx?$/,
   snapshotPathTemplate: `{testDir}/__screenshots__/${mode.toLowerCase()}/{projectName}/{testFilePath}-{arg}{ext}`,
 
-  timeout: 60000,
+  timeout: 30000,
   forbidOnly: !isDevMode,
   reporter: 'list',
   retries: isDevMode ? 0 : 2,
@@ -42,7 +42,9 @@ export default defineConfig({
 
   use: {
     testIdAttribute: 'data-test',
-    headless: (value => value ? value === 'true' : !isDevMode)(env.TEST_HEADLESS_MODE),
+    headless: ((value) => (value ? value === 'true' : !isDevMode))(
+      env.TEST_HEADLESS_MODE,
+    ),
     ignoreHTTPSErrors: true,
     screenshot: {
       fullPage: true,
@@ -52,15 +54,15 @@ export default defineConfig({
     video: isDevMode ? 'on-first-retry' : 'on',
   },
 
-  projects: PROJECTS_LIST[mode].map(project => ({
+  projects: PROJECTS_LIST[mode].map((project) => ({
     name: project,
-    use: {...devices[project]},
-  }))
+    use: { ...devices[project] },
+  })),
 });
 
 export function isKeyOfObject<T extends object>(
-    key: string | number | symbol,
-    obj: T,
+  key: string | number | symbol,
+  obj: T,
 ): key is keyof T {
   return key in obj;
 }
diff --git a/...screenshots__/github_mac/Desktop-Safari/basics.e2e.ts-basics-simple-usage-1.png b/...screenshots__/github_mac/Desktop-Safari/basics.e2e.ts-basics-simple-usage-1.png
diff --git a/tests/basics.e2e.ts b/tests/basics.e2e.ts
@@ -19,8 +19,14 @@ import { prepareNetwork, RouteFulfill, toPostData } from './utlis';
 import { mockRunRequest, waitRunRequest } from './utlis/mocks/compiler';
 
 test.describe('basics', () => {
+  let unroute: CallableFunction;
+
   test.beforeEach(async ({ context, baseURL }) => {
-    await prepareNetwork(context, baseURL); // offline mode
+    unroute = await prepareNetwork(context, baseURL); // offline mode
+  });
+
+  test.afterEach(async () => {
+    if (unroute) unroute();
   });
 
   test('simple usage', async ({ page }) => {

diff --git a/tests/utlis/index.ts b/tests/utlis/index.ts
@@ -3,19 +3,27 @@ import { mockVersions } from './mocks/compiler';
 
 export type RouteFulfill = Parameters<Route['fulfill']>[0];
 
-export function refuseExternalUrls(context: BrowserContext, baseURL: string) {
+export async function refuseExternalUrls(
+  context: BrowserContext,
+  baseURL: string,
+) {
   const host = new URL(baseURL).host;
-  return context.route(
-    (url) => url.host !== host,
-    (route) => route.abort('connectionrefused'),
-  );
+
+  const checkUrl = (url: URL) => url.host && url.host !== host;
+  const onMatch = (route: Route) => route.abort('connectionrefused');
+
+  await context.route(checkUrl, onMatch);
+  return () => context.unroute(checkUrl, onMatch);
 }
 
-export function prepareNetwork(context: BrowserContext, baseURL: string) {
-  return Promise.all([
-    refuseExternalUrls(context, baseURL),
-    mockVersions(context),
-  ]);
+export async function prepareNetwork(context: BrowserContext, baseURL: string) {
+  const unRefuse = await refuseExternalUrls(context, baseURL);
+  const unVersions = await mockVersions(context);
+
+  return async () => {
+    await unVersions();
+    await unRefuse();
+  };
 }
 
 export function toPostData(code: string) {

diff --git a/tests/utlis/mocks/compiler.ts b/tests/utlis/mocks/compiler.ts
@@ -6,22 +6,23 @@ export const API_HOST = 'api.kotlinlang.org';
 
 function defaultVersions(route: Route, req: Request) {
   if (req.method() !== 'GET') {
-    route.fallback();
-    return;
+    return route.continue();
   }
 
   return route.fulfill({ path: join(__dirname, 'versions.json') });
 }
 
-export function mockVersions(
+export async function mockVersions(
   context: BrowserContext,
   resp?: Parameters<BrowserContext['route']>[1],
 ) {
-  return context.route(
-    (url) =>
-      url.host === API_HOST && url.pathname.match(/^\/?\/versions$/) !== null,
-    resp || defaultVersions,
-  );
+  const checkUrl = (url: URL) =>
+    url.host === API_HOST && url.pathname.match(/^\/?\/versions$/) !== null;
+  const onMatch = resp || defaultVersions;
+
+  await context.route(checkUrl, onMatch);
+
+  return () => context.unroute(checkUrl, onMatch);
 }
 
 function isRunRequest(url: URL | string) {