From 1afabc671d78611580037661ade1fe95836884b2 Mon Sep 17 00:00:00 2001
From: 4gray <serega05@gmail.com>
Date: Mon, 2 Jan 2023 19:04:39 +0100
Subject: [PATCH] test(e2e): adjust playwright configuration

---
 .gitignore                                       | 1 +
 electron-builder.json                            | 5 ++++-
 package.json                                     | 2 +-
 e2e/playwright.config.ts => playwright.config.ts | 3 +--
 4 files changed, 7 insertions(+), 4 deletions(-)
 rename e2e/playwright.config.ts => playwright.config.ts (92%)

diff --git a/.gitignore b/.gitignore
index ff6729c87..27f1d2e78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,6 +56,7 @@ package-lock.json
 /e2e/*.js
 !/e2e/protractor.conf.js
 /e2e/*.map
+/e2e/db
 
 # System Files
 .DS_Store
diff --git a/electron-builder.json b/electron-builder.json
index 3b4ce1294..e1bd5191a 100644
--- a/electron-builder.json
+++ b/electron-builder.json
@@ -21,7 +21,10 @@
         "!tsconfig.*.json",
         "!tslint.json",
         "!*.png",
-        "!coverage"
+        "!coverage",
+        "!e2e",
+        "!playwright-report",
+        "!test-report"
     ],
     "win": {
         "icon": "dist/assets/icons",
diff --git a/package.json b/package.json
index e9c9b4ba9..6acfb11b7 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
         "electron:build:windows": "npm run build:prod && electron-builder build -w",
         "test": "jest",
         "test:watch": "jest --watch",
-        "e2e": "npm run build:electron && npx playwright test -c e2e/playwright.config.ts e2e/",
+        "e2e": "npm run build:electron && npx playwright test -c playwright.config.ts",
         "e2e:debug": "npm run build:electron && PWDEBUG=1 npx playwright test -c e2e/playwright.config.ts e2e/ /",
         "e2e:html-report": "npm run build:electron && npm run e2e -- --reporter=html",
         "e2e:show-report": "npx playwright show-report",
diff --git a/e2e/playwright.config.ts b/playwright.config.ts
similarity index 92%
rename from e2e/playwright.config.ts
rename to playwright.config.ts
index ea7a1e996..1c800721e 100644
--- a/e2e/playwright.config.ts
+++ b/playwright.config.ts
@@ -1,7 +1,7 @@
 import { devices, PlaywrightTestConfig } from '@playwright/test';
 
 const config: PlaywrightTestConfig = {
-    testDir: '.',
+    testDir: './e2e',
     maxFailures: 2,
     projects: [
         {
@@ -15,7 +15,6 @@ const config: PlaywrightTestConfig = {
             name: 'firefox',
             use: {
                 ...devices['Desktop Firefox'],
-                ignoreHTTPSErrors: true,
                 serviceWorkers: 'block',
             },
         },