From 4c11f5d8856c488a24469c0c9c87d855229bc164 Mon Sep 17 00:00:00 2001
From: Dmitry Gozman <dgozman@gmail.com>
Date: Mon, 28 Dec 2020 11:14:33 -0800
Subject: [PATCH] test: remove hacky requires, use imports instead (#4835)

Since our client implements our types, we can now import
implementation in tests without type conflicts.
---
 test/css-parser.spec.ts         | 5 +----
 test/fixtures.spec.ts           | 2 +-
 test/queryselector.spec.ts      | 4 +---
 test/selector-generator.spec.ts | 4 +---
 test/selectors-css.spec.ts      | 4 +---
 test/selectors-misc.spec.ts     | 4 +---
 test/selectors-text.spec.ts     | 4 +---
 7 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/test/css-parser.spec.ts b/test/css-parser.spec.ts
index 501dbcf5b0..0e956783dd 100644
--- a/test/css-parser.spec.ts
+++ b/test/css-parser.spec.ts
@@ -15,10 +15,7 @@
  */
 
 import { it, expect } from './fixtures';
-import * as path from 'path';
-
-const { parseCSS, serializeSelector: serialize } =
-    require(path.join(__dirname, '..', 'lib', 'server', 'common', 'cssParser'));
+import { parseCSS, serializeSelector as serialize } from '../src/server/common/cssParser';
 
 const parse = (selector: string) => {
   return parseCSS(selector, new Set(['text', 'not', 'has', 'react', 'scope', 'right-of', 'scope', 'is'])).selector;
diff --git a/test/fixtures.spec.ts b/test/fixtures.spec.ts
index ab43ccb692..62e7dc6dd6 100644
--- a/test/fixtures.spec.ts
+++ b/test/fixtures.spec.ts
@@ -18,6 +18,7 @@
 import { folio, RemoteServer } from './remoteServer.fixture';
 import { execSync } from 'child_process';
 import path from 'path';
+import * as stackTrace from '../src/utils/stackTrace';
 
 type FixturesFixtures = {
   connectedRemoteServer: RemoteServer;
@@ -129,7 +130,6 @@ describe('fixtures', (suite, { platform, headful }) => {
 });
 
 it('caller file path', async ({}) => {
-  const stackTrace = require(path.join(__dirname, '..', 'lib', 'utils', 'stackTrace'));
   const callme = require('./fixtures/callback');
   const filePath = callme(() => {
     return stackTrace.getCallerFilePath(path.join(__dirname, 'fixtures') + path.sep);
diff --git a/test/queryselector.spec.ts b/test/queryselector.spec.ts
index 45cc9a5b9c..1b829cc7b8 100644
--- a/test/queryselector.spec.ts
+++ b/test/queryselector.spec.ts
@@ -16,9 +16,7 @@
  */
 
 import { it, expect } from './fixtures';
-import * as path from 'path';
-
-const { selectorsV2Enabled } = require(path.join(__dirname, '..', 'lib', 'server', 'common', 'selectorParser'));
+import { selectorsV2Enabled } from '../src/server/common/selectorParser';
 
 it('should throw for non-string selector', async ({page}) => {
   const error = await page.$(null).catch(e => e);
diff --git a/test/selector-generator.spec.ts b/test/selector-generator.spec.ts
index 0abfe35ec8..485c85cbb9 100644
--- a/test/selector-generator.spec.ts
+++ b/test/selector-generator.spec.ts
@@ -15,10 +15,8 @@
  */
 
 import { folio } from './fixtures';
-import * as path from 'path';
 import type { Page, Frame } from '..';
-
-const { source } = require(path.join(__dirname, '..', 'lib', 'generated', 'consoleApiSource'));
+import { source } from '../src/generated/consoleApiSource';
 
 const fixtures = folio.extend();
 fixtures.context.override(async ({ context }, run) => {
diff --git a/test/selectors-css.spec.ts b/test/selectors-css.spec.ts
index 2f7f9cb375..97274013f5 100644
--- a/test/selectors-css.spec.ts
+++ b/test/selectors-css.spec.ts
@@ -16,9 +16,7 @@
  */
 
 import { it, expect } from './fixtures';
-import * as path from 'path';
-
-const { selectorsV2Enabled } = require(path.join(__dirname, '..', 'lib', 'server', 'common', 'selectorParser'));
+import { selectorsV2Enabled } from '../src/server/common/selectorParser';
 
 it('should work with large DOM', async ({page, server}) => {
   await page.evaluate(() => {
diff --git a/test/selectors-misc.spec.ts b/test/selectors-misc.spec.ts
index 7620839e1a..0dfc259f18 100644
--- a/test/selectors-misc.spec.ts
+++ b/test/selectors-misc.spec.ts
@@ -16,9 +16,7 @@
  */
 
 import { it, expect } from './fixtures';
-import * as path from 'path';
-
-const { selectorsV2Enabled } = require(path.join(__dirname, '..', 'lib', 'server', 'common', 'selectorParser'));
+import { selectorsV2Enabled } from '../src/server/common/selectorParser';
 
 it('should work for open shadow roots', async ({page, server}) => {
   await page.goto(server.PREFIX + '/deep-shadow.html');
diff --git a/test/selectors-text.spec.ts b/test/selectors-text.spec.ts
index 98d8a36428..0938f42654 100644
--- a/test/selectors-text.spec.ts
+++ b/test/selectors-text.spec.ts
@@ -16,9 +16,7 @@
  */
 
 import { it, expect } from './fixtures';
-import * as path from 'path';
-
-const { selectorsV2Enabled } = require(path.join(__dirname, '..', 'lib', 'server', 'common', 'selectorParser'));
+import { selectorsV2Enabled } from '../src/server/common/selectorParser';
 
 it('should work', async ({page}) => {
   await page.setContent(`<div>yo</div><div>ya</div><div>\nye  </div>`);