From 64947f19b362c95dd1fba79d63efecc0afcffc88 Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <aslushnikov@gmail.com>
Date: Mon, 14 Sep 2020 15:06:45 -0700
Subject: [PATCH] cherrypick(release-1.4): fix compatibility to the domain
 module (#3878)

Cherry-picking https://github.com/microsoft/playwright/pull/3851

References #3848
---
 src/client/channelOwner.ts  |  2 ++
 test/channels.spec.ts       | 21 +++++++++++++++++++++
 test/playwright.fixtures.ts |  1 +
 3 files changed, 24 insertions(+)

diff --git a/src/client/channelOwner.ts b/src/client/channelOwner.ts
index be7d84a53f..020c8cc800 100644
--- a/src/client/channelOwner.ts
+++ b/src/client/channelOwner.ts
@@ -62,6 +62,8 @@ export abstract class ChannelOwner<T extends channels.Channel = channels.Channel
           return obj.addListener;
         if (prop === 'removeEventListener')
           return obj.removeListener;
+        if (prop === 'domain') // https://github.com/microsoft/playwright/issues/3848
+          return obj.domain;
         return (params: any) => this._connection.sendMessageToServer(this._type, guid, String(prop), params);
       },
     });
diff --git a/test/channels.spec.ts b/test/channels.spec.ts
index 68eec88191..9ab7ed2c9e 100644
--- a/test/channels.spec.ts
+++ b/test/channels.spec.ts
@@ -15,9 +15,22 @@
  * limitations under the License.
  */
 
+import domain from 'domain';
+import { registerWorkerFixture } from '@playwright/test-runner';
 import { it, expect, options } from './playwright.fixtures';
 import type { ChromiumBrowser } from '..';
 
+registerWorkerFixture('domain', async ({ }, test) => {
+  const local = domain.create();
+  local.run(() => { });
+  let err;
+  local.on('error', e => err = e);
+  local.enter();
+  await test(null);
+  if (err)
+    throw err;
+});
+
 it('should work', async ({browser}) => {
   expect(!!browser['_connection']).toBeTruthy();
 });
@@ -144,6 +157,14 @@ it('should scope browser handles', async ({browserType, defaultBrowserOptions})
   await expectScopeState(browserType, GOLDEN_PRECONDITION);
 });
 
+it('should work with the domain module', async ({ domain, browserType }) => {
+  const browser = await browserType.launch();
+  const page = await browser.newPage();
+  const result = await page.evaluate(() => 1 + 1);
+  expect(result).toBe(2);
+  await browser.close();
+});
+
 async function expectScopeState(object, golden) {
   golden = trimGuids(golden);
   const remoteState = trimGuids(await object._channel.debugScopeState());
diff --git a/test/playwright.fixtures.ts b/test/playwright.fixtures.ts
index 285bd51a3f..985f515971 100644
--- a/test/playwright.fixtures.ts
+++ b/test/playwright.fixtures.ts
@@ -48,6 +48,7 @@ declare global {
     browserType: BrowserType<Browser>;
     browser: Browser;
     httpService: {server: TestServer, httpsServer: TestServer}
+    domain: void;
     toImpl: (rpcObject: any) => any;
   }
   interface TestState {