From 3f5cca3cea652e2a0fca866fb2a9962851ece6ba Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Thu, 24 Nov 2022 09:45:51 +0100
Subject: [PATCH] move e2e tests to a commonjs project as they dont work in
 esmodule context

---
 src/Umbraco.Web.UI.Client/e2e/installer.spec.ts | 2 +-
 src/Umbraco.Web.UI.Client/e2e/login.spec.ts     | 2 +-
 src/Umbraco.Web.UI.Client/e2e/package.json      | 4 ++++
 src/Umbraco.Web.UI.Client/{ => e2e}/test.ts     | 2 +-
 src/Umbraco.Web.UI.Client/e2e/upgrader.spec.ts  | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/e2e/package.json
 rename src/Umbraco.Web.UI.Client/{ => e2e}/test.ts (90%)

diff --git a/src/Umbraco.Web.UI.Client/e2e/installer.spec.ts b/src/Umbraco.Web.UI.Client/e2e/installer.spec.ts
index 93f78bda78..80340063f2 100644
--- a/src/Umbraco.Web.UI.Client/e2e/installer.spec.ts
+++ b/src/Umbraco.Web.UI.Client/e2e/installer.spec.ts
@@ -1,8 +1,8 @@
 import { rest } from 'msw';
 
-import { expect, test } from '../test';
 import { umbracoPath } from '@umbraco-cms/utils';
 import { ProblemDetails, RuntimeLevel, ServerStatus } from '@umbraco-cms/backend-api';
+import { expect, test } from './test';
 
 test.describe('installer tests', () => {
 	test.beforeEach(async ({ page, worker }) => {
diff --git a/src/Umbraco.Web.UI.Client/e2e/login.spec.ts b/src/Umbraco.Web.UI.Client/e2e/login.spec.ts
index 7bfff100a5..2b0598fa92 100644
--- a/src/Umbraco.Web.UI.Client/e2e/login.spec.ts
+++ b/src/Umbraco.Web.UI.Client/e2e/login.spec.ts
@@ -1,4 +1,4 @@
-import { expect, test } from '../test';
+import { expect, test } from './test';
 
 test('login', async ({ page }) => {
 	// Go to /login
diff --git a/src/Umbraco.Web.UI.Client/e2e/package.json b/src/Umbraco.Web.UI.Client/e2e/package.json
new file mode 100644
index 0000000000..959170ed46
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/e2e/package.json
@@ -0,0 +1,4 @@
+{
+	"name": "backoffice-e2e",
+	"type": "commonjs"
+}
diff --git a/src/Umbraco.Web.UI.Client/test.ts b/src/Umbraco.Web.UI.Client/e2e/test.ts
similarity index 90%
rename from src/Umbraco.Web.UI.Client/test.ts
rename to src/Umbraco.Web.UI.Client/e2e/test.ts
index 9908815d0f..ac1d6ea703 100644
--- a/src/Umbraco.Web.UI.Client/test.ts
+++ b/src/Umbraco.Web.UI.Client/e2e/test.ts
@@ -2,7 +2,7 @@ import { expect, test as base } from '@playwright/test';
 import { createWorkerFixture } from 'playwright-msw';
 import type { MockServiceWorker } from 'playwright-msw';
 
-import { handlers } from './src/core/mocks/e2e-handlers';
+import { handlers } from '../src/core/mocks/e2e-handlers';
 
 const test = base.extend<{
 	worker: MockServiceWorker;
diff --git a/src/Umbraco.Web.UI.Client/e2e/upgrader.spec.ts b/src/Umbraco.Web.UI.Client/e2e/upgrader.spec.ts
index 8af19dab8c..878cb92509 100644
--- a/src/Umbraco.Web.UI.Client/e2e/upgrader.spec.ts
+++ b/src/Umbraco.Web.UI.Client/e2e/upgrader.spec.ts
@@ -1,7 +1,7 @@
 import { rest } from 'msw';
-import { expect, test } from '../test';
 import { umbracoPath } from '@umbraco-cms/utils';
 import { ProblemDetails, RuntimeLevel, ServerStatus } from '@umbraco-cms/backend-api';
+import { expect, test } from './test';
 
 test.describe('upgrader tests', () => {
 	test.beforeEach(async ({ page, worker }) => {