Merge pull request #850 from portier/feat/e2e-deps

Update E2E test lockfile
portier · Apr 7, 2024 · 0799e25 · 0799e25
2 parents a60a686 + 732cdc1
commit 0799e25
Show file tree

Hide file tree

Showing 4 changed files with 294 additions and 316 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -110,27 +110,35 @@ jobs:
 
     - name: E2E test deps
       run: cd tests/e2e/ && yarn --frozen-lockfile
+      timeout-minutes: 10
 
     - name: E2E test Firefox
       run: cd tests/e2e/ && SELENIUM_BROWSER=firefox ./main.js
+      timeout-minutes: 10
 
     - name: E2E test Chrome
       run: cd tests/e2e/ && SELENIUM_BROWSER=chrome ./main.js
+      timeout-minutes: 10
 
     - name: E2E test Redis
       run: cd tests/e2e/ && TEST_STORE=redis TEST_KEY_MANAGER=rotating ./main.js
+      timeout-minutes: 10
 
     - name: E2E test SQLite
       run: cd tests/e2e/ && TEST_STORE=sqlite TEST_KEY_MANAGER=rotating ./main.js
+      timeout-minutes: 10
 
     - name: E2E test sendmail
       run: cd tests/e2e/ && TEST_MAILER=sendmail ./main.js
+      timeout-minutes: 10
 
     - name: E2E test Postmark
       run: cd tests/e2e/ && TEST_MAILER=postmark ./main.js
+      timeout-minutes: 10
 
     - name: E2E test Mailgun
       run: cd tests/e2e/ && TEST_MAILER=mailgun ./main.js
+      timeout-minutes: 10
 
   macos-build:
     runs-on: macos-latest
@@ -171,12 +179,13 @@ jobs:
 
     - name: E2E test deps
       run: cd tests/e2e/ && yarn --frozen-lockfile
+      timeout-minutes: 10
 
     - name: E2E test Safari
       run: cd tests/e2e/ && SELENIUM_BROWSER=safari ./main.js
+      timeout-minutes: 10
       # TODO: fails sporadically
       continue-on-error: true
-      timeout-minutes: 1
 
   windows-build:
     runs-on: windows-latest

diff --git a/tests/e2e/src/mailbox.ts b/tests/e2e/src/mailbox.ts
@@ -2,6 +2,7 @@
 import { SMTPServer } from "smtp-server";
 import { simpleParser } from "mailparser";
 import { TEST_MAILER } from "./env";
+import type { Stream } from "stream";
 
 const parseOptions = {
   skipHtmlToText: true,
@@ -10,7 +11,7 @@ const parseOptions = {
 
 export interface Mailbox {
   pushRawMail(
-    input: string | NodeJS.ReadableStream,
+    input: string | Stream,
     callback?: (err?: Error | undefined) => void
   ): void;
   pushMail(mail: string): void;
@@ -28,7 +29,7 @@ export default (): Mailbox => {
   // Exported API.
   const api: Mailbox = {
     pushRawMail(
-      input: string | NodeJS.ReadableStream,
+      input: string | Stream,
       callback?: (err?: Error) => void
     ): void {
       simpleParser(input, parseOptions as any, (err, parsed) => {

diff --git a/tests/e2e/src/main.ts b/tests/e2e/src/main.ts
@@ -52,8 +52,8 @@ const createDriver = async () => {
   const firefoxOptions = new firefox.Options().windowSize(windowSize);
   const chromeOptions = new chrome.Options().windowSize(windowSize);
   if (HEADLESS === "1") {
-    firefoxOptions.headless();
-    chromeOptions.headless();
+    firefoxOptions.addArguments("-headless");
+    chromeOptions.addArguments("--headless=new");
   }
 
   const builder = new Builder();