refactor to remove braking change

ChainSafe · Jan 16, 2023 · b6e89e2 · b6e89e2
1 parent c148a5c
commit b6e89e2
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 19 deletions.
diff --git a/src/setup/index.ts b/src/setup/index.ts
@@ -18,16 +18,7 @@ export const bootstrap = async ({
   browser: DappeteerBrowser;
   metaMaskPage: DappeteerPage;
 }> => {
-  const browser = await launch({
-    headless: true,
-    playwrightOptions: {
-      args: ["--accept-lang=en"],
-    },
-    puppeteerOptions: {
-      args: ["--accept-lang=en"],
-    },
-    ...launchOptions,
-  });
+  const browser = await launch(launchOptions);
   const metaMask = await setupMetaMask(browser, {
     seed,
     password,
@@ -52,13 +43,6 @@ export const initSnapEnv = async (
   snapId: string;
 }> => {
   const browser = await launch({
-    headless: true,
-    playwrightOptions: {
-      args: ["--accept-lang=en"],
-    },
-    puppeteerOptions: {
-      args: ["--accept-lang=en"],
-    },
     ...opts,
     metaMaskFlask: true,
   });

diff --git a/src/setup/launch.ts b/src/setup/launch.ts
@@ -44,7 +44,7 @@ export async function launch(
         `
       );
 
-    console.warn(); // new line
+    console.log(); // new line
 
     metamaskPath = await downloader(metaMaskVersion, {
       location: metaMaskLocation,

diff --git a/src/setup/playwright.ts b/src/setup/playwright.ts
@@ -21,6 +21,7 @@ export async function launchPlaywright(
       ...(options.playwrightOptions ?? {}),
       headless: options.headless,
       args: [
+        "--accept-lang=en",
         `--disable-extensions-except=${metamaskPath}`,
         `--load-extension=${metamaskPath}`,
         ...(options.playwrightOptions?.args || []),

diff --git a/src/setup/puppeteer.ts b/src/setup/puppeteer.ts
@@ -11,6 +11,7 @@ export async function launchPuppeteer(
     ...(options.puppeteerOptions ?? {}),
     headless: options.headless,
     args: [
+      "--accept-lang=en",
       `--disable-extensions-except=${metamaskPath}`,
       `--load-extension=${metamaskPath}`,
       ...(options.puppeteerOptions?.args || []),

diff --git a/src/types.ts b/src/types.ts
@@ -21,7 +21,7 @@ export type DappeteerLaunchOptions = {
   //fallbacks to installed dependency and prefers playwright if both are installed
   automation?: "puppeteer" | "playwright";
   browser: "chrome";
-  headless?: boolean; // default true
+  headless?: boolean; // default false
   puppeteerOptions?: Parameters<typeof puppeteerLaunch>[0];
   playwrightOptions?: PlaywrightLaunchOptions;
 };

diff --git a/test/global.ts b/test/global.ts
@@ -27,6 +27,7 @@ export const mochaHooks = {
       automation:
         (process.env.AUTOMATION as "puppeteer" | "playwright") ?? "puppeteer",
       browser: "chrome",
+      headless: true,
       metaMaskVersion:
         process.env.METAMASK_VERSION || dappeteer.RECOMMENDED_METAMASK_VERSION,
     });

diff --git a/test/global_flask.ts b/test/global_flask.ts
@@ -24,6 +24,7 @@ export const mochaHooks = {
       automation:
         (process.env.AUTOMATION as "puppeteer" | "playwright") ?? "puppeteer",
       browser: "chrome",
+      headless: true,
       metaMaskVersion:
         process.env.METAMASK_VERSION || dappeteer.RECOMMENDED_METAMASK_VERSION,
       metaMaskFlask: true,