Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added assets/[email protected]
Binary file not shown.
189 changes: 184 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"scripts": {
"build": "tsc --build && npm run build-bundles && npm run copy-static && node scripts/create-client-scripts-symlinks.js",
"copy-static": "copyfiles 'src/browser/client-scripts/*' 'src/**/[!cache]*/autogenerated/**/*.json' build",
"copy-static": "copyfiles 'src/browser/client-scripts/*' 'src/**/[!cache]*/autogenerated/**/*.json' 'assets/*' build",
"build-node-bundle": "esbuild ./src/bundle/cjs/index.ts --outdir=./build/src/bundle/cjs --bundle --format=cjs --platform=node --target=ES2021",
"build-browser-bundle": "node ./src/browser/client-scripts/build.js",
"build-bundles": "concurrently -c 'auto' 'npm:build-browser-bundle' 'npm:build-node-bundle --minify'",
Expand Down Expand Up @@ -69,6 +69,7 @@
"@jspm/core": "2.0.1",
"@puppeteer/browsers": "2.7.1",
"@rrweb/record": "2.0.0-alpha.18",
"@testing-library/dom": "10.4.0",
"@testplane/devtools": "8.32.3",
"@testplane/wdio-protocols": "9.4.6",
"@testplane/wdio-utils": "9.5.3",
Expand Down
14 changes: 14 additions & 0 deletions src/browser/browser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ import { AsyncEmitter } from "../events";
import { BrowserConfig } from "../config/browser-config";
import type { Callstack } from "./history/callstack";
import type { WdProcess, WebdriverPool } from "../browser-pool/webdriver-pool";
import { configure, setupBrowser } from "./queries";
import { getFirefoxCSPAddOn } from "./queries/firefoxCSPAddOn";
import { getNormalizedBrowserName } from "../utils/browser";

const CUSTOM_SESSION_OPTS = [
"outputDir",
Expand Down Expand Up @@ -102,6 +105,17 @@ export class Browser {
this._addExtendOptionsMethod(this._session!);
}

protected async _installFirefoxCSPAddOn(): Promise<string> {
if (getNormalizedBrowserName(this._session!.capabilities.browserName) !== "firefox") return Promise.resolve("");
const firefoxCSPAddOn = await getFirefoxCSPAddOn();
return this._session!.installAddOn(firefoxCSPAddOn, false);
}

protected _addQueries(): void {
configure({ testIdAttribute: this._config.testIdAttribute, asyncUtilTimeout: this._config.waitTimeout });
setupBrowser(this._session!);
}

protected _addSteps(): void {
addRunStepCommand(this);
}
Expand Down
2 changes: 2 additions & 0 deletions src/browser/existing-browser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ export class ExistingBrowser extends Browser {

this._extendStacktrace();
this._addSteps();
await this._installFirefoxCSPAddOn();
this._addQueries();
this._addHistory();

await history.runGroup(
Expand Down
2 changes: 2 additions & 0 deletions src/browser/new-browser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ export class NewBrowser extends Browser {

this._extendStacktrace();
this._addSteps();
await this._installFirefoxCSPAddOn();
this._addQueries();
this._addHistory();

await runGroup(
Expand Down
7 changes: 7 additions & 0 deletions src/browser/queries/firefoxCSPAddOn.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import fs from "fs/promises";
import path from "path";

export const getFirefoxCSPAddOn = async (): Promise<string> => {
const extension = await fs.readFile(path.join(__dirname, "../../../assets/[email protected]"));
return extension.toString("base64");
};
Loading
Loading