[gold] Delete Webpack and Karma config files.
Bug: skia:12109
Change-Id: Id7463929d279c0612589b8e93ca7e8a3c1c087ed
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/431176
Commit-Queue: Leandro Lovisolo <lovisolo@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
diff --git a/golden/karma.conf.ts b/golden/karma.conf.ts
deleted file mode 100644
index e2e1a4d..0000000
--- a/golden/karma.conf.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import webpack from 'webpack';
-import karma from 'karma';
-import webpackConfigFactory from './webpack.config';
-import { setCommonConfigOptions } from '../infra-sk/karma.common';
-
-export = function(karmaConfig: karma.Config) {
- const webpackConfig = webpackConfigFactory('', { mode: 'development' }) as webpack.Configuration;
- setCommonConfigOptions(karmaConfig, webpackConfig);
-}
diff --git a/golden/modules/blamelist-panel-sk/blamelist-panel-sk_puppeteer_test.ts b/golden/modules/blamelist-panel-sk/blamelist-panel-sk_puppeteer_test.ts
index 56607b2..c0c65a4 100644
--- a/golden/modules/blamelist-panel-sk/blamelist-panel-sk_puppeteer_test.ts
+++ b/golden/modules/blamelist-panel-sk/blamelist-panel-sk_puppeteer_test.ts
@@ -1,19 +1,15 @@
import { expect } from 'chai';
-import {inBazel, loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
-import path from "path";
+import {loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
describe('blamelist-panel-sk', () => {
let testBed: TestBed;
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
- });
- beforeEach(async () => {
- await testBed.page.goto(
- inBazel() ? testBed.baseUrl : `${testBed.baseUrl}/dist/blamelist-panel-sk.html`);
+ testBed = await loadCachedTestBed();
});
+ beforeEach(async () => {
+ await testBed.page.goto(testBed.baseUrl);
+ });
it('should render the demo page', async () => {
expect(await testBed.page.$$('blamelist-panel-sk')).to.have.length(4); // Smoke test.
});
diff --git a/golden/modules/bulk-triage-sk/bulk-triage-sk_puppeteer_test.ts b/golden/modules/bulk-triage-sk/bulk-triage-sk_puppeteer_test.ts
index ee0cecf..c09c743 100644
--- a/golden/modules/bulk-triage-sk/bulk-triage-sk_puppeteer_test.ts
+++ b/golden/modules/bulk-triage-sk/bulk-triage-sk_puppeteer_test.ts
@@ -1,23 +1,20 @@
import { expect } from 'chai';
-import {inBazel, loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
+import {loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
import { BulkTriageSkPO } from './bulk-triage-sk_po';
import { ElementHandle } from 'puppeteer';
-import path from "path";
describe('bulk-triage-sk', () => {
let bulkTriageSk: ElementHandle;
let bulkTriageSkPO: BulkTriageSkPO;
let testBed: TestBed;
+
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
beforeEach(async () => {
- await testBed.page.goto(
- inBazel() ? testBed.baseUrl : `${testBed.baseUrl}/dist/bulk-triage-sk.html`);
+ await testBed.page.goto(testBed.baseUrl);
bulkTriageSk = (await testBed.page.$('#default'))!;
bulkTriageSkPO = new BulkTriageSkPO(bulkTriageSk);
diff --git a/golden/modules/byblame-page-sk/byblame-page-sk_puppeteer_test.ts b/golden/modules/byblame-page-sk/byblame-page-sk_puppeteer_test.ts
index 33f1ba4..7161a59 100644
--- a/golden/modules/byblame-page-sk/byblame-page-sk_puppeteer_test.ts
+++ b/golden/modules/byblame-page-sk/byblame-page-sk_puppeteer_test.ts
@@ -1,25 +1,22 @@
import { expect } from 'chai';
import {
- addEventListenersToPuppeteerPage, inBazel,
+ addEventListenersToPuppeteerPage,
loadCachedTestBed,
takeScreenshot,
TestBed
} from '../../../puppeteer-tests/util';
-import path from "path";
describe('byblame-page-sk', () => {
let testBed: TestBed;
+
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
beforeEach(async () => {
const eventPromise = await addEventListenersToPuppeteerPage(testBed.page, ['end-task']);
const loaded = eventPromise('end-task'); // Emitted when page is loaded.
- await testBed.page.goto(
- inBazel() ? testBed.baseUrl : `${testBed.baseUrl}/dist/byblame-page-sk.html`);
+ await testBed.page.goto(testBed.baseUrl);
await loaded;
});
diff --git a/golden/modules/byblameentry-sk/byblameentry-sk_puppeteer_test.ts b/golden/modules/byblameentry-sk/byblameentry-sk_puppeteer_test.ts
index 5a2942b..c160a77 100644
--- a/golden/modules/byblameentry-sk/byblameentry-sk_puppeteer_test.ts
+++ b/golden/modules/byblameentry-sk/byblameentry-sk_puppeteer_test.ts
@@ -1,17 +1,15 @@
import { expect } from 'chai';
-import {inBazel, loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
-import path from "path";
+import {loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
describe('byblameentry-sk', () => {
let testBed: TestBed;
+
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
+
beforeEach(async () => {
- await testBed.page.goto(
- inBazel() ? testBed.baseUrl : `${testBed.baseUrl}/dist/byblameentry-sk.html`);
+ await testBed.page.goto(testBed.baseUrl);
});
it('should render the demo page', async () => {
diff --git a/golden/modules/changelist-controls-sk/changelist-controls-sk_puppeteer_test.ts b/golden/modules/changelist-controls-sk/changelist-controls-sk_puppeteer_test.ts
index 2d3f6e3..e7cf7d7 100644
--- a/golden/modules/changelist-controls-sk/changelist-controls-sk_puppeteer_test.ts
+++ b/golden/modules/changelist-controls-sk/changelist-controls-sk_puppeteer_test.ts
@@ -1,17 +1,15 @@
import { expect } from 'chai';
-import {inBazel, loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
-import path from "path";
+import {loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
describe('changelist-controls-sk', () => {
let testBed: TestBed;
+
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
beforeEach(async () => {
- await testBed.page.goto(inBazel() ? testBed.baseUrl : `${testBed.baseUrl}/dist/changelist-controls-sk.html`);
+ await testBed.page.goto(testBed.baseUrl);
});
it('should render the demo page', async () => {
diff --git a/golden/modules/changelists-page-sk/changelists-page-sk_puppeteer_test.ts b/golden/modules/changelists-page-sk/changelists-page-sk_puppeteer_test.ts
index 57936e4..f156ef8 100644
--- a/golden/modules/changelists-page-sk/changelists-page-sk_puppeteer_test.ts
+++ b/golden/modules/changelists-page-sk/changelists-page-sk_puppeteer_test.ts
@@ -1,24 +1,22 @@
import { expect } from 'chai';
import {
- addEventListenersToPuppeteerPage, inBazel,
+ addEventListenersToPuppeteerPage,
loadCachedTestBed,
takeScreenshot,
TestBed
} from '../../../puppeteer-tests/util';
-import path from "path";
describe('changelists-page-sk', () => {
let testBed: TestBed;
+
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
+
beforeEach(async () => {
const eventPromise = await addEventListenersToPuppeteerPage(testBed.page, ['end-task']);
const loaded = eventPromise('end-task'); // Emitted when page is loaded.
- await testBed.page.goto(
- inBazel() ? testBed.baseUrl : `${testBed.baseUrl}/dist/changelists-page-sk.html`);
+ await testBed.page.goto(testBed.baseUrl);
await loaded;
});
diff --git a/golden/modules/cluster-digests-sk/cluster-digests-sk_puppeteer_test.ts b/golden/modules/cluster-digests-sk/cluster-digests-sk_puppeteer_test.ts
index 99de181..e00ff62 100644
--- a/golden/modules/cluster-digests-sk/cluster-digests-sk_puppeteer_test.ts
+++ b/golden/modules/cluster-digests-sk/cluster-digests-sk_puppeteer_test.ts
@@ -1,20 +1,17 @@
import { expect } from 'chai';
import {
- addEventListenersToPuppeteerPage, EventName, inBazel, loadCachedTestBed,
+ addEventListenersToPuppeteerPage, EventName, loadCachedTestBed,
takeScreenshot, TestBed
} from '../../../puppeteer-tests/util';
import { ElementHandle } from 'puppeteer';
import { positiveDigest, negativeDigest, untriagedDigest } from '../cluster-page-sk/test_data';
-import path from "path";
import {ClusterDigestsSkPO} from './cluster-digests-sk_po';
describe('cluster-digests-sk', () => {
let testBed: TestBed;
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
let promiseFactory: <T>(eventName: EventName) => Promise<T>;
@@ -29,8 +26,7 @@
['layout-complete', 'selection-changed']);
const loaded = promiseFactory('layout-complete'); // Emitted when layout stabilizes.
- await testBed.page.goto(
- inBazel() ? testBed.baseUrl : `${testBed.baseUrl}/dist/cluster-digests-sk.html`);
+ await testBed.page.goto(testBed.baseUrl);
await loaded;
clusterDigestsSk = (await testBed.page.$('cluster-digests-sk'))!;
diff --git a/golden/modules/cluster-page-sk/cluster-page-sk_puppeteer_test.ts b/golden/modules/cluster-page-sk/cluster-page-sk_puppeteer_test.ts
index fd895fb..e0e4c35 100644
--- a/golden/modules/cluster-page-sk/cluster-page-sk_puppeteer_test.ts
+++ b/golden/modules/cluster-page-sk/cluster-page-sk_puppeteer_test.ts
@@ -1,10 +1,9 @@
import { expect } from 'chai';
import {
- addEventListenersToPuppeteerPage, EventName, inBazel, loadCachedTestBed,
+ addEventListenersToPuppeteerPage, EventName, loadCachedTestBed,
takeScreenshot, TestBed
} from '../../../puppeteer-tests/util';
import { positiveDigest, negativeDigest, untriagedDigest } from '../cluster-page-sk/test_data';
-import path from "path";
import {ClusterPageSkPO} from './cluster-page-sk_po';
import {ElementHandle} from 'puppeteer';
@@ -12,9 +11,7 @@
let testBed: TestBed;
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
let clusterPageSk: ElementHandle;
@@ -30,8 +27,7 @@
testBed.page, ['layout-complete', 'selection-changed']);
const loaded = promiseFactory('layout-complete'); // Emitted when layout stabilizes.
- await testBed.page.goto(
- inBazel() ? testBed.baseUrl : `${testBed.baseUrl}/dist/cluster-page-sk.html`);
+ await testBed.page.goto(testBed.baseUrl);
await loaded;
clusterPageSk = (await testBed.page.$('cluster-page-sk'))!;
diff --git a/golden/modules/corpus-selector-sk/corpus-selector-sk_puppeteer_test.ts b/golden/modules/corpus-selector-sk/corpus-selector-sk_puppeteer_test.ts
index c847e5b..2c995c8 100644
--- a/golden/modules/corpus-selector-sk/corpus-selector-sk_puppeteer_test.ts
+++ b/golden/modules/corpus-selector-sk/corpus-selector-sk_puppeteer_test.ts
@@ -1,18 +1,15 @@
import { expect } from 'chai';
-import {inBazel, loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
-import path from "path";
+import {loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
describe('corpus-selector-sk', () => {
let testBed: TestBed;
+
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
beforeEach(async () => {
- await testBed.page.goto(
- inBazel() ? testBed.baseUrl : `${testBed.baseUrl}/dist/corpus-selector-sk.html`);
+ await testBed.page.goto(testBed.baseUrl);
});
it('should render the demo page', async () => {
diff --git a/golden/modules/details-page-sk/details-page-sk_puppeteer_test.ts b/golden/modules/details-page-sk/details-page-sk_puppeteer_test.ts
index c281f0a..ec1fd92 100644
--- a/golden/modules/details-page-sk/details-page-sk_puppeteer_test.ts
+++ b/golden/modules/details-page-sk/details-page-sk_puppeteer_test.ts
@@ -1,21 +1,18 @@
import { expect } from 'chai';
import {
- addEventListenersToPuppeteerPage, inBazel,
+ addEventListenersToPuppeteerPage,
loadCachedTestBed,
takeScreenshot,
TestBed
} from '../../../puppeteer-tests/util';
import { ElementHandle, Page } from 'puppeteer';
-import path from "path";
import {DetailsPageSkPO} from './details-page-sk_po';
describe('details-page-sk', () => {
let testBed: TestBed;
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
// The demo page pushes a "default" query string to the URL when no query string is provided. All
@@ -103,8 +100,7 @@
async function navigateTo(page: Page, base: string, queryParams = ''): Promise<DetailsPageSkPO> {
const eventPromise = await addEventListenersToPuppeteerPage(page, ['busy-end']);
const loaded = eventPromise('busy-end'); // Emitted from gold-scaffold when page is loaded.
- await page.goto(
- inBazel() ? `${base}${queryParams}` : `${base}/dist/details-page-sk.html${queryParams}`);
+ await page.goto(`${base}${queryParams}`);
await loaded;
return new DetailsPageSkPO(page.$('details-page-sk'));
}
diff --git a/golden/modules/diff-page-sk/diff-page-sk_puppeteer_test.ts b/golden/modules/diff-page-sk/diff-page-sk_puppeteer_test.ts
index 48e9871..f742b32 100644
--- a/golden/modules/diff-page-sk/diff-page-sk_puppeteer_test.ts
+++ b/golden/modules/diff-page-sk/diff-page-sk_puppeteer_test.ts
@@ -1,21 +1,18 @@
import { expect } from 'chai';
import {
- addEventListenersToPuppeteerPage, inBazel,
+ addEventListenersToPuppeteerPage,
loadCachedTestBed,
takeScreenshot,
TestBed
} from '../../../puppeteer-tests/util';
import { Page } from 'puppeteer';
-import path from "path";
import { DiffPageSkPO } from './diff-page-sk_po';
describe('diff-page-sk', () => {
let testBed: TestBed;
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
// The demo page pushes a "default" query string to the URL when no query string is provided. All
@@ -83,8 +80,7 @@
async function navigateTo(page: Page, base: string, queryParams = ''): Promise<DiffPageSkPO> {
const eventPromise = await addEventListenersToPuppeteerPage(page, ['busy-end']);
const loaded = eventPromise('busy-end'); // Emitted from gold-scaffold when page is loaded.
- await page.goto(
- inBazel() ? `${base}${queryParams}` : `${base}/dist/diff-page-sk.html${queryParams}`);
+ await page.goto(`${base}${queryParams}`);
await loaded;
return new DiffPageSkPO(page.$('diff-page-sk'));
}
diff --git a/golden/modules/digest-details-sk/digest-details-sk_puppeteer_test.ts b/golden/modules/digest-details-sk/digest-details-sk_puppeteer_test.ts
index e052332..e78ab30 100644
--- a/golden/modules/digest-details-sk/digest-details-sk_puppeteer_test.ts
+++ b/golden/modules/digest-details-sk/digest-details-sk_puppeteer_test.ts
@@ -1,20 +1,14 @@
import { expect } from 'chai';
-import {inBazel, loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
-import path from "path";
+import {loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
describe('digest-details-sk', () => {
let testBed: TestBed;
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
beforeEach(async () => {
- await testBed.page.goto(
- inBazel()
- ? testBed.baseUrl
- : `${testBed.baseUrl}/dist/digest-details-sk.html`, { waitUntil: 'networkidle0' });
+ await testBed.page.goto(testBed.baseUrl, { waitUntil: 'networkidle0' });
});
it('should render the demo page', async () => {
diff --git a/golden/modules/dots-legend-sk/dots-legend-sk_puppeteer_test.ts b/golden/modules/dots-legend-sk/dots-legend-sk_puppeteer_test.ts
index 54fd2ca..733ad07 100644
--- a/golden/modules/dots-legend-sk/dots-legend-sk_puppeteer_test.ts
+++ b/golden/modules/dots-legend-sk/dots-legend-sk_puppeteer_test.ts
@@ -1,18 +1,15 @@
import { expect } from 'chai';
-import {inBazel, loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
-import path from "path";
+import {loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
describe('dots-legend-sk', () => {
let testBed: TestBed;
+
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
beforeEach(async () => {
- await testBed.page.goto(
- inBazel() ? testBed.baseUrl : `${testBed.baseUrl}/dist/dots-legend-sk.html`);
+ await testBed.page.goto(testBed.baseUrl);
});
it('should render the demo page', async () => {
diff --git a/golden/modules/dots-sk/dots-sk_puppeteer_test.ts b/golden/modules/dots-sk/dots-sk_puppeteer_test.ts
index 6b39a45..410e4d7 100644
--- a/golden/modules/dots-sk/dots-sk_puppeteer_test.ts
+++ b/golden/modules/dots-sk/dots-sk_puppeteer_test.ts
@@ -1,16 +1,15 @@
import { expect } from 'chai';
-import {inBazel, loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
-import path from "path";
+import {loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
describe('dots-sk', () => {
let testBed: TestBed;
+
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
+
beforeEach(async () => {
- await testBed.page.goto(inBazel() ? testBed.baseUrl : `${testBed.baseUrl}/dist/dots-sk.html`);
+ await testBed.page.goto(testBed.baseUrl);
});
it('should render the demo page', async () => {
diff --git a/golden/modules/edit-ignore-rule-sk/edit-ignore-rule-sk_puppeteer_test.ts b/golden/modules/edit-ignore-rule-sk/edit-ignore-rule-sk_puppeteer_test.ts
index dd22a7d..7d27e15 100644
--- a/golden/modules/edit-ignore-rule-sk/edit-ignore-rule-sk_puppeteer_test.ts
+++ b/golden/modules/edit-ignore-rule-sk/edit-ignore-rule-sk_puppeteer_test.ts
@@ -1,18 +1,15 @@
import { expect } from 'chai';
-import {inBazel, loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
-import path from "path";
+import {loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
describe('edit-ignore-rule-sk', () => {
let testBed: TestBed;
+
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
beforeEach(async () => {
- await testBed.page.goto(
- inBazel() ? testBed.baseUrl : `${testBed.baseUrl}/dist/edit-ignore-rule-sk.html`);
+ await testBed.page.goto(testBed.baseUrl);
});
it('should render the demo page', async () => {
diff --git a/golden/modules/filter-dialog-sk/filter-dialog-sk_puppeteer_test.ts b/golden/modules/filter-dialog-sk/filter-dialog-sk_puppeteer_test.ts
index ad97629..11bddaa 100644
--- a/golden/modules/filter-dialog-sk/filter-dialog-sk_puppeteer_test.ts
+++ b/golden/modules/filter-dialog-sk/filter-dialog-sk_puppeteer_test.ts
@@ -1,21 +1,18 @@
import { expect } from 'chai';
-import {inBazel, loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
+import {loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
import { FilterDialogSkPO, NumericParamPO } from './filter-dialog-sk_po';
-import path from "path";
describe('filter-dialog-sk', () => {
let filterDialogSkPO: FilterDialogSkPO;
let testBed: TestBed;
+
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
beforeEach(async () => {
- await testBed.page.goto(
- inBazel() ? testBed.baseUrl : `${testBed.baseUrl}/dist/filter-dialog-sk.html`);
+ await testBed.page.goto(testBed.baseUrl);
await testBed.page.setViewport({width: 800, height: 800});
filterDialogSkPO = new FilterDialogSkPO((await testBed.page.$('filter-dialog-sk'))!);
});
diff --git a/golden/modules/gold-scaffold-sk/gold-scaffold-sk_puppeteer_test.ts b/golden/modules/gold-scaffold-sk/gold-scaffold-sk_puppeteer_test.ts
index d7cd65e..ec5495b 100644
--- a/golden/modules/gold-scaffold-sk/gold-scaffold-sk_puppeteer_test.ts
+++ b/golden/modules/gold-scaffold-sk/gold-scaffold-sk_puppeteer_test.ts
@@ -1,17 +1,15 @@
import { expect } from 'chai';
-import {inBazel, loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
-import path from "path";
+import {loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
describe('gold-scaffold-sk', () => {
let testBed: TestBed;
+
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
+
beforeEach(async () => {
- await testBed.page.goto(
- inBazel() ? testBed.baseUrl : `${testBed.baseUrl}/dist/gold-scaffold-sk.html`);
+ await testBed.page.goto(testBed.baseUrl);
});
it('should render the demo page', async () => {
diff --git a/golden/modules/ignores-page-sk/ignores-page-sk_puppeteer_test.ts b/golden/modules/ignores-page-sk/ignores-page-sk_puppeteer_test.ts
index 6486814..33c488b 100644
--- a/golden/modules/ignores-page-sk/ignores-page-sk_puppeteer_test.ts
+++ b/golden/modules/ignores-page-sk/ignores-page-sk_puppeteer_test.ts
@@ -1,19 +1,17 @@
import { expect } from 'chai';
import {
- addEventListenersToPuppeteerPage, inBazel,
+ addEventListenersToPuppeteerPage,
loadCachedTestBed,
takeScreenshot,
TestBed
} from '../../../puppeteer-tests/util';
import { Page } from 'puppeteer';
-import path from "path";
describe('ignores-page-sk', () => {
let testBed: TestBed;
+
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
it('should render the demo page', async () => {
@@ -68,7 +66,6 @@
async function navigateTo(page: Page, base: string, queryParams = '') {
const eventPromise = await addEventListenersToPuppeteerPage(page, ['end-task']);
const loaded = eventPromise('end-task'); // Emitted when page is loaded.
- await page.goto(
- inBazel() ? `${base}${queryParams}` : `${base}/dist/ignores-page-sk.html${queryParams}`);
+ await page.goto(`${base}${queryParams}`);
await loaded;
}
diff --git a/golden/modules/image-compare-sk/image-compare-sk_puppeteer_test.ts b/golden/modules/image-compare-sk/image-compare-sk_puppeteer_test.ts
index ecd907a..4f9a1bc 100644
--- a/golden/modules/image-compare-sk/image-compare-sk_puppeteer_test.ts
+++ b/golden/modules/image-compare-sk/image-compare-sk_puppeteer_test.ts
@@ -1,20 +1,15 @@
import { expect } from 'chai';
-import {inBazel, loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
-import path from "path";
+import {loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
describe('image-compare-sk', () => {
let testBed: TestBed;
+
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
beforeEach(async () => {
- await testBed.page.goto(
- inBazel()
- ? testBed.baseUrl
- : `${testBed.baseUrl}/dist/image-compare-sk.html`, { waitUntil: 'networkidle0' });
+ await testBed.page.goto(testBed.baseUrl, { waitUntil: 'networkidle0' });
});
it('should render the demo page', async () => {
diff --git a/golden/modules/last-commit-sk/last-commit-sk_puppeteer_test.ts b/golden/modules/last-commit-sk/last-commit-sk_puppeteer_test.ts
index 73a5e4a..469b4da 100644
--- a/golden/modules/last-commit-sk/last-commit-sk_puppeteer_test.ts
+++ b/golden/modules/last-commit-sk/last-commit-sk_puppeteer_test.ts
@@ -1,18 +1,15 @@
import { expect } from 'chai';
-import {inBazel, loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
-import path from "path";
+import {loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
describe('last-commit-sk', () => {
let testBed: TestBed;
+
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
beforeEach(async () => {
- await testBed.page.goto(
- inBazel() ? testBed.baseUrl : `${testBed.baseUrl}/dist/last-commit-sk.html`);
+ await testBed.page.goto(testBed.baseUrl);
});
it('should render the demo page', async () => {
diff --git a/golden/modules/list-page-sk/list-page-sk_puppeteer_test.ts b/golden/modules/list-page-sk/list-page-sk_puppeteer_test.ts
index c06fb28..9cb9b03 100644
--- a/golden/modules/list-page-sk/list-page-sk_puppeteer_test.ts
+++ b/golden/modules/list-page-sk/list-page-sk_puppeteer_test.ts
@@ -1,19 +1,17 @@
import { expect } from 'chai';
import {
- addEventListenersToPuppeteerPage, inBazel,
+ addEventListenersToPuppeteerPage,
loadCachedTestBed,
takeScreenshot,
TestBed
} from '../../../puppeteer-tests/util';
import { Page } from 'puppeteer';
-import path from 'path';
describe('list-page-sk', () => {
let testBed: TestBed;
+
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
it('should render the demo page', async () => {
@@ -136,7 +134,6 @@
async function navigateTo(page: Page, base: string, queryParams = '') {
const eventPromise = await addEventListenersToPuppeteerPage(page, ['busy-end']);
const loaded = eventPromise('busy-end'); // Emitted when page is loaded.
- await page.goto(
- inBazel() ? `${base}${queryParams}` : `${base}/dist/list-page-sk.html${queryParams}`);
+ await page.goto(`${base}${queryParams}`);
await loaded;
}
diff --git a/golden/modules/multi-zoom-sk/multi-zoom-sk_puppeteer_test.ts b/golden/modules/multi-zoom-sk/multi-zoom-sk_puppeteer_test.ts
index f106879..e640a23 100644
--- a/golden/modules/multi-zoom-sk/multi-zoom-sk_puppeteer_test.ts
+++ b/golden/modules/multi-zoom-sk/multi-zoom-sk_puppeteer_test.ts
@@ -1,19 +1,15 @@
import { expect } from 'chai';
-import {inBazel, loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
-import path from "path";
+import {loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
describe('multi-zoom-sk', () => {
let testBed: TestBed;
+
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
+
beforeEach(async () => {
- await testBed.page.goto(
- inBazel()
- ? testBed.baseUrl
- : `${testBed.baseUrl}/dist/multi-zoom-sk.html`, { waitUntil: 'networkidle0' });
+ await testBed.page.goto(testBed.baseUrl, { waitUntil: 'networkidle0' });
});
it('should render the demo page', async () => {
diff --git a/golden/modules/query-dialog-sk/query-dialog-sk_puppeteer_test.ts b/golden/modules/query-dialog-sk/query-dialog-sk_puppeteer_test.ts
index d2da450..f618d30 100644
--- a/golden/modules/query-dialog-sk/query-dialog-sk_puppeteer_test.ts
+++ b/golden/modules/query-dialog-sk/query-dialog-sk_puppeteer_test.ts
@@ -1,21 +1,18 @@
import { expect } from 'chai';
-import {inBazel, loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
+import {loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
import { QueryDialogSkPO } from './query-dialog-sk_po';
-import path from "path";
describe('query-dialog-sk', () => {
let queryDialogSkPO: QueryDialogSkPO;
let testBed: TestBed;
+
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
beforeEach(async () => {
- await testBed.page.goto(
- inBazel() ? testBed.baseUrl : `${testBed.baseUrl}/dist/query-dialog-sk.html`);
+ await testBed.page.goto(testBed.baseUrl);
queryDialogSkPO = new QueryDialogSkPO((await testBed.page.$('query-dialog-sk'))!);
});
diff --git a/golden/modules/search-controls-sk/search-controls-sk_puppeteer_test.ts b/golden/modules/search-controls-sk/search-controls-sk_puppeteer_test.ts
index da473d5..d6d5a90 100644
--- a/golden/modules/search-controls-sk/search-controls-sk_puppeteer_test.ts
+++ b/golden/modules/search-controls-sk/search-controls-sk_puppeteer_test.ts
@@ -1,17 +1,15 @@
import { expect } from 'chai';
-import {inBazel, loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
-import path from "path";
+import {loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
describe('search-controls-sk', () => {
let testBed: TestBed;
+
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
+
beforeEach(async () => {
- await testBed.page.goto(
- inBazel() ? testBed.baseUrl : `${testBed.baseUrl}/dist/search-controls-sk.html`);
+ await testBed.page.goto(testBed.baseUrl);
await testBed.page.setViewport({width: 1200, height: 800});
});
diff --git a/golden/modules/search-page-sk/search-page-sk_puppeteer_test.ts b/golden/modules/search-page-sk/search-page-sk_puppeteer_test.ts
index 71e4cc1..9b557bb 100644
--- a/golden/modules/search-page-sk/search-page-sk_puppeteer_test.ts
+++ b/golden/modules/search-page-sk/search-page-sk_puppeteer_test.ts
@@ -1,13 +1,12 @@
import { expect } from 'chai';
import {
addEventListenersToPuppeteerPage,
- EventName, inBazel,
+ EventName,
loadCachedTestBed,
takeScreenshot,
TestBed
} from '../../../puppeteer-tests/util';
import { SearchPageSkPO } from './search-page-sk_po';
-import path from "path";
describe('search-page-sk', () => {
let eventPromiseFactory: <T>(eventName: EventName) => Promise<T>;
@@ -15,18 +14,14 @@
let searchPageSkPO: SearchPageSkPO;
let testBed: TestBed;
+
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
const goToPage = async (queryString = '') => {
const busyEnd = eventPromiseFactory('busy-end');
- await testBed.page.goto(
- inBazel()
- ? `${testBed.baseUrl}${queryString}`
- : `${testBed.baseUrl}/dist/search-page-sk.html${queryString}`);
+ await testBed.page.goto(`${testBed.baseUrl}${queryString}`);
await busyEnd;
await testBed.page.setViewport({width: 1600, height: 1200});
diff --git a/golden/modules/sort-toggle-sk/sort-toggle-sk_puppeteer_test.ts b/golden/modules/sort-toggle-sk/sort-toggle-sk_puppeteer_test.ts
index 64e1a1e..4dbf41d 100644
--- a/golden/modules/sort-toggle-sk/sort-toggle-sk_puppeteer_test.ts
+++ b/golden/modules/sort-toggle-sk/sort-toggle-sk_puppeteer_test.ts
@@ -1,17 +1,15 @@
import { expect } from 'chai';
import {
- addEventListenersToPuppeteerPage, EventName, inBazel, loadCachedTestBed,
+ addEventListenersToPuppeteerPage, EventName, loadCachedTestBed,
takeScreenshot, TestBed
} from '../../../puppeteer-tests/util';
import { ElementHandle } from 'puppeteer';
-import path from "path";
describe('sort-toggle-sk', () => {
let testBed: TestBed;
+
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
let promiseFactory: <T>(eventName: EventName) => Promise<T>;
@@ -21,8 +19,7 @@
promiseFactory = await addEventListenersToPuppeteerPage(testBed.page,
['sort-changed']);
const loaded = promiseFactory('sort-changed'); // Emitted when sorted.
- await testBed.page.goto(
- inBazel() ? testBed.baseUrl : `${testBed.baseUrl}/dist/sort-toggle-sk.html`);
+ await testBed.page.goto(testBed.baseUrl);
await loaded;
sortToggleSk = (await testBed.page.$('#container sort-toggle-sk'))!;
});
diff --git a/golden/modules/trace-filter-sk/trace-filter-sk_puppeteer_test.ts b/golden/modules/trace-filter-sk/trace-filter-sk_puppeteer_test.ts
index 3819463..364a3ed 100644
--- a/golden/modules/trace-filter-sk/trace-filter-sk_puppeteer_test.ts
+++ b/golden/modules/trace-filter-sk/trace-filter-sk_puppeteer_test.ts
@@ -1,21 +1,18 @@
import { expect } from 'chai';
-import {inBazel, loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
+import {loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
import { TraceFilterSkPO } from './trace-filter-sk_po';
-import path from "path";
describe('trace-filter-sk', () => {
let traceFilterSkPO: TraceFilterSkPO;
let testBed: TestBed;
+
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
beforeEach(async () => {
- await testBed.page.goto(
- inBazel() ? testBed.baseUrl : `${testBed.baseUrl}/dist/trace-filter-sk.html`);
+ await testBed.page.goto(testBed.baseUrl);
traceFilterSkPO = new TraceFilterSkPO((await testBed.page.$('trace-filter-sk'))!);
});
diff --git a/golden/modules/triage-sk/triage-sk_puppeteer_test.ts b/golden/modules/triage-sk/triage-sk_puppeteer_test.ts
index 69f8fc3..fa136bf 100644
--- a/golden/modules/triage-sk/triage-sk_puppeteer_test.ts
+++ b/golden/modules/triage-sk/triage-sk_puppeteer_test.ts
@@ -1,20 +1,17 @@
import { expect } from 'chai';
-import {inBazel, loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
-import path from "path";
+import {loadCachedTestBed, takeScreenshot, TestBed} from '../../../puppeteer-tests/util';
import {TriageSkPO} from './triage-sk_po';
import {ElementHandle} from 'puppeteer';
describe('triage-sk', () => {
let testBed: TestBed;
+
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts')
- );
+ testBed = await loadCachedTestBed();
});
beforeEach(async () => {
- await testBed.page.goto(
- inBazel() ? testBed.baseUrl : `${testBed.baseUrl}/dist/triage-sk.html`);
+ await testBed.page.goto(testBed.baseUrl);
});
it('should render the demo page', async () => {
diff --git a/golden/modules/triagelog-page-sk/triagelog-page-sk_puppeteer_test.ts b/golden/modules/triagelog-page-sk/triagelog-page-sk_puppeteer_test.ts
index 1a593ec..1c208b1 100644
--- a/golden/modules/triagelog-page-sk/triagelog-page-sk_puppeteer_test.ts
+++ b/golden/modules/triagelog-page-sk/triagelog-page-sk_puppeteer_test.ts
@@ -1,6 +1,5 @@
-import path from 'path';
import {
- addEventListenersToPuppeteerPage, inBazel,
+ addEventListenersToPuppeteerPage,
loadCachedTestBed,
takeScreenshot,
TestBed,
@@ -9,18 +8,14 @@
describe('triagelog-page-sk', () => {
let testBed: TestBed;
before(async () => {
- testBed = await loadCachedTestBed(
- path.join(__dirname, '..', '..', 'webpack.config.ts'),
- );
+ testBed = await loadCachedTestBed();
});
describe('v1 APIs', () => {
beforeEach(async () => {
const eventPromise = await addEventListenersToPuppeteerPage(testBed.page, ['end-task']);
const loaded = eventPromise('end-task'); // Emitted when page is loaded.
- await testBed.page.goto(
- inBazel() ? testBed.baseUrl : `${testBed.baseUrl}/dist/triagelog-page-sk.html`,
- );
+ await testBed.page.goto(testBed.baseUrl);
await loaded;
});
@@ -34,10 +29,7 @@
beforeEach(async () => {
const eventPromise = await addEventListenersToPuppeteerPage(testBed.page, ['end-task']);
const loaded = eventPromise('end-task'); // Emitted when page is loaded.
- await testBed.page.goto(
- inBazel() ? `${testBed.baseUrl}?use_new_api=true`
- : `${testBed.baseUrl}/dist/triagelog-page-sk.html?use_new_api=true`,
- );
+ await testBed.page.goto(`${testBed.baseUrl}?use_new_api=true`);
await loaded;
});
diff --git a/golden/tsconfig.json b/golden/tsconfig.json
deleted file mode 100644
index 5e75205..0000000
--- a/golden/tsconfig.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "extends": "../tsconfig",
- "include": [
- "./modules/**/*.ts",
- "./pages/**/*.ts",
- ],
-}
diff --git a/golden/webpack.config.ts b/golden/webpack.config.ts
deleted file mode 100644
index ee3eee6..0000000
--- a/golden/webpack.config.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { resolve } from 'path';
-import webpack from 'webpack';
-import CopyWebpackPlugin from 'copy-webpack-plugin';
-import commonBuilder from '../infra-sk/pulito/webpack.common';
-
-const configFactory: webpack.ConfigurationFactory = (_, args) => {
- const config = commonBuilder(__dirname, args.mode);
- config.output!.publicPath = '/dist/';
- config.resolve = config.resolve || {};
- // https://github.com/webpack/node-libs-browser/issues/26#issuecomment-267954095
- config.resolve.modules = [resolve(__dirname, '..', 'node_modules')];
-
- // Copy static assets into the //golden/dist directory.
- const copyPatterns: any[] = [{
- from: resolve(__dirname, 'static/favicon.ico'), to: 'favicon.ico',
- }];
- if (args.mode !== 'production') {
- copyPatterns.push({from: resolve(__dirname, 'demo-page-assets')});
- }
- config.plugins!.push(new CopyWebpackPlugin(copyPatterns));
-
- return config;
-};
-
-export = configFactory;
diff --git a/puppeteer-tests/docker/run-tests.sh b/puppeteer-tests/docker/run-tests.sh
index c8cdcc0..cd57b7a 100755
--- a/puppeteer-tests/docker/run-tests.sh
+++ b/puppeteer-tests/docker/run-tests.sh
@@ -81,12 +81,6 @@
cp -r /src/puppeteer-tests/*.ts /tests/puppeteer-tests
cp -r /src/puppeteer-tests/tsconfig.json /tests/puppeteer-tests
-mkdir /tests/golden
-cp -r /src/golden/webpack.config.ts /tests/golden
-cp -r /src/golden/tsconfig.json /tests/golden
-cp -r /src/golden/modules /tests/golden
-cp -r /src/golden/demo-page-assets /tests/golden
-
mkdir /tests/perf
cp -r /src/perf/webpack.config.ts /tests/perf
cp -r /src/perf/tsconfig.json /tests/perf
@@ -190,9 +184,6 @@
cd /tests/infra-sk
npx mocha -r ts-node/register ./**/*_puppeteer_test.ts
-cd /tests/golden
-npx mocha -r ts-node/register ./**/*_puppeteer_test.ts
-
cd /tests/perf
npx mocha -r ts-node/register ./**/*_puppeteer_test.ts
diff --git a/puppeteer-tests/util.ts b/puppeteer-tests/util.ts
index ca14dac..99387db 100644
--- a/puppeteer-tests/util.ts
+++ b/puppeteer-tests/util.ts
@@ -227,13 +227,13 @@
* value: "true") to give demo pages a means to detect whether they are running within Puppeteer or
* not.
*/
-export async function loadCachedTestBed(pathToWebpackConfigTs: string) {
+export async function loadCachedTestBed(pathToWebpackConfigTs?: string) {
if (testBed) {
return testBed as TestBed;
}
const newTestBed: Partial<TestBed> = {};
- if (inBazel()) {
+ if (inBazel() || !pathToWebpackConfigTs) {
// Read the demo page server's TCP port.
const envDir = process.env.ENV_DIR;
if (!envDir) throw new Error('required environment variable ENV_DIR is unset');
