Remove playwright directory nesting (#1108)

* Remove playwright directory nesting

* Rename test files to match naming convention

injected/README.md

@@ -165,8 +165,7 @@ npm run test-unit
 ```
 
 #### Feature Integration Tests (playwright)
-Everything within `integration-test/playwright` is integration tests controlled by Playwright. These should be defaulted
-to for any new tests that include UI elements (such as click to load)
+Everything within `integration-test` is integration tests controlled by Playwright.
 
 ```shell
 npm run test-int

injected/integration-test/playwright/duckplayer.setup.e2e.spec.js → injected/integration-test/duckplayer.setup.e2e.spec.js

@@ -1,6 +1,6 @@
 import { test } from '@playwright/test'
 import { DuckplayerOverlays } from './page-objects/duckplayer-overlays.js'
-import { STORAGE_STATE } from '../../playwright-e2e.config.js'
+import { STORAGE_STATE } from '../playwright-e2e.config.js'
 
 test.describe('e2e: Dismiss cookies', () => {
     test('storage locally', async ({ page }, workerInfo) => {

injected/integration-test/playwright/page-objects/duckplayer-overlays.js → injected/integration-test/page-objects/duckplayer-overlays.js

@@ -12,22 +12,22 @@ import { windowsGlobalPolyfills } from '../shared.mjs'
 
 // Every possible combination of UserValues
 const userValues = {
-    /** @type {import("../../../src/features/duck-player.js").UserValues} */
+    /** @type {import("../../src/features/duck-player.js").UserValues} */
     'always ask': {
         privatePlayerMode: { alwaysAsk: {} },
         overlayInteracted: false
     },
-    /** @type {import("../../../src/features/duck-player.js").UserValues} */
+    /** @type {import("../../src/features/duck-player.js").UserValues} */
     'always ask remembered': {
         privatePlayerMode: { alwaysAsk: {} },
         overlayInteracted: true
     },
-    /** @type {import("../../../src/features/duck-player.js").UserValues} */
+    /** @type {import("../../src/features/duck-player.js").UserValues} */
     enabled: {
         privatePlayerMode: { enabled: {} },
         overlayInteracted: false
     },
-    /** @type {import("../../../src/features/duck-player.js").UserValues} */
+    /** @type {import("../../src/features/duck-player.js").UserValues} */
     disabled: {
         privatePlayerMode: { disabled: {} },
         overlayInteracted: false

injected/integration-test/playwright/remote-pages.spec.js → injected/integration-test/remote-pages.spec.js

@@ -1,9 +1,9 @@
 import { test, expect } from '@playwright/test'
 import path from 'path'
 import { readFileSync } from 'fs'
-import { baseFeatures } from '../../src/features.js'
+import { baseFeatures } from '../src/features.js'
 
-const testRoot = path.join('integration-test', 'playwright')
+const testRoot = path.join('integration-test')
 
 function getHARPath (harFile) {
     return path.join(testRoot, 'data', 'har', harFile)

injected/playwright-e2e.config.js

@@ -8,12 +8,12 @@ export default defineConfig({
     projects: [
         {
             name: 'duckplayer-e2e-setup',
-            testMatch: ['integration-test/playwright/duckplayer.setup.e2e.spec.js'],
+            testMatch: ['integration-test/duckplayer.setup.e2e.spec.js'],
             use: { injectName: 'apple-isolated', platform: 'macos' }
         },
         {
             name: 'duckplayer-e2e',
-            testMatch: ['integration-test/playwright/duckplayer.e2e.spec.js'],
+            testMatch: ['integration-test/duckplayer.e2e.spec.js'],
             use: {
                 injectName: 'apple-isolated',
                 platform: 'macos',

injected/playwright.config.js

@@ -5,61 +5,61 @@ export default defineConfig({
         {
             name: 'windows',
             testMatch: [
-                'integration-test/playwright/duckplayer.spec.js',
-                'integration-test/playwright/duckplayer-remote-config.spec.js',
-                'integration-test/playwright/harmful-apis.spec.js',
-                'integration-test/playwright/windows-permissions.spec.js',
-                'integration-test/playwright/broker-protection.spec.js',
-                'integration-test/playwright/breakage-reporting.spec.js'
+                'integration-test/duckplayer.spec.js',
+                'integration-test/duckplayer-remote-config.spec.js',
+                'integration-test/harmful-apis.spec.js',
+                'integration-test/windows-permissions.spec.js',
+                'integration-test/broker-protection.spec.js',
+                'integration-test/breakage-reporting.spec.js'
             ],
             use: { injectName: 'windows', platform: 'windows' }
         },
         {
             name: 'apple-isolated',
             testMatch: [
-                'integration-test/playwright/duckplayer.spec.js',
-                'integration-test/playwright/duckplayer-remote-config.spec.js',
-                'integration-test/playwright/broker-protection.spec.js'
+                'integration-test/duckplayer.spec.js',
+                'integration-test/duckplayer-remote-config.spec.js',
+                'integration-test/broker-protection.spec.js'
             ],
             use: { injectName: 'apple-isolated', platform: 'macos' }
         },
         {
             name: 'apple',
             testMatch: [
-                'integration-test/playwright/webcompat.spec.js'
+                'integration-test/webcompat.spec.js'
             ],
             use: { injectName: 'apple', platform: 'macos' }
         },
         {
             name: 'ios',
             testMatch: [
-                'integration-test/playwright/duckplayer-mobile.spec.js'
+                'integration-test/duckplayer-mobile.spec.js'
             ],
             use: { injectName: 'apple-isolated', platform: 'ios', ...devices['iPhone 13'] }
         },
         {
             name: 'android',
             testMatch: [
-                'integration-test/playwright/duckplayer-mobile.spec.js'
+                'integration-test/duckplayer-mobile.spec.js'
             ],
             use: { injectName: 'android', platform: 'android', ...devices['Galaxy S5'] }
         },
         {
             name: 'chrome',
             testMatch: [
-                'integration-test/playwright/remote-pages.spec.js',
-                'integration-test/test-cookie.js',
-                'integration-test/test-fingerprint.js',
-                'integration-test/test-navigator-interface.js',
-                'integration-test/test-pages.js',
-                'integration-test/test-utils.js',
-                'integration-test/test-web-compat.js'
+                'integration-test/remote-pages.spec.js',
+                'integration-test/cookie.spec.js',
+                'integration-test/fingerprint.spec.js',
+                'integration-test/navigator-interface.spec.js',
+                'integration-test/pages.spec.js',
+                'integration-test/utils.spec.js',
+                'integration-test/web-compat.spec.js'
             ],
             use: { injectName: 'chrome', platform: 'extension', ...devices['Desktop Chrome'] }
         },
         {
             name: 'firefox',
-            testMatch: 'integration-test/playwright/remote-pages.spec.js',
+            testMatch: 'integration-test/remote-pages.spec.js',
             use: { injectName: 'firefox', platform: 'extension', ...devices['Desktop Firefox'] }
         }
     ],

injected/scripts/generate-har.js

@@ -1,6 +1,6 @@
 import { chromium } from '@playwright/test'
 
-const testPath = 'integration-test/playwright/data/har/duckduckgo.com/search.har'
+const testPath = 'integration-test/data/har/duckduckgo.com/search.har'
 
 async function init () {
     const browser = await chromium.launch()

messaging/lib/test-utils.mjs

@@ -6,7 +6,7 @@
  * @typedef {import("../../messaging/index.js").RequestMessage} RequestMessage
  * @typedef {import("../../messaging/index.js").NotificationMessage} NotificationMessage
  * @typedef {WindowsRequestMessage | WindowsNotification | SubscriptionEvent} AnyWindowsMessage
- * @typedef {import("../../injected/integration-test/playwright/type-helpers.mjs").PlatformInfo} PlatformInfo
+ * @typedef {import("../../injected/integration-test/type-helpers.mjs").PlatformInfo} PlatformInfo
  */
 /**
  * Install a mock interface for windows messaging

special-pages/tests/page-objects/duck-player.js

@@ -1,7 +1,7 @@
 import { Mocks } from './mocks.js'
 import { expect } from '@playwright/test'
 import { join } from 'node:path'
-import { perPlatform } from '../../../injected/integration-test/playwright/type-helpers.mjs'
+import { perPlatform } from '../../../injected/integration-test/type-helpers.mjs'
 
 const MOCK_VIDEO_ID = 'VIDEO_ID'
 const MOCK_VIDEO_TITLE = 'Embedded Video - YouTube'
@@ -25,8 +25,8 @@ const html = {
 }
 
 /**
- * @typedef {import('../../../injected/integration-test/playwright/type-helpers.mjs').Build} Build
- * @typedef {import('../../../injected/integration-test/playwright/type-helpers.mjs').PlatformInfo} PlatformInfo
+ * @typedef {import('../../../injected/integration-test/type-helpers.mjs').Build} Build
+ * @typedef {import('../../../injected/integration-test/type-helpers.mjs').PlatformInfo} PlatformInfo
  */
 
 export class DuckPlayerPage {

special-pages/tests/page-objects/mocks.js

@@ -16,8 +16,8 @@ export class Mocks {
 
     /**
      * @param {import("@playwright/test").Page} page
-     * @param {import("../../../injected/integration-test/playwright/type-helpers.mjs").Build} build
-     * @param {import("../../../injected/integration-test/playwright/type-helpers.mjs").PlatformInfo} platform
+     * @param {import("../../../injected/integration-test/type-helpers.mjs").Build} build
+     * @param {import("../../../injected/integration-test/type-helpers.mjs").PlatformInfo} platform
      * @param {import("@duckduckgo/messaging").MessagingContext} messagingContext
      */
     constructor (page, build, platform, messagingContext) {

special-pages/tests/page-objects/newtab.js

@@ -1,10 +1,10 @@
 import { Mocks } from './mocks.js'
-import { perPlatform } from '../../../injected/integration-test/playwright/type-helpers.mjs'
+import { perPlatform } from '../../../injected/integration-test/type-helpers.mjs'
 import { join } from 'node:path'
 
 /**
- * @typedef {import('../../../injected/integration-test/playwright/type-helpers.mjs').Build} Build
- * @typedef {import('../../../injected/integration-test/playwright/type-helpers.mjs').PlatformInfo} PlatformInfo
+ * @typedef {import('../../../injected/integration-test/type-helpers.mjs').Build} Build
+ * @typedef {import('../../../injected/integration-test/type-helpers.mjs').PlatformInfo} PlatformInfo
  */
 
 export class NewtabPage {

special-pages/tests/page-objects/onboarding.js

@@ -1,11 +1,11 @@
 import { Mocks } from './mocks.js'
-import { perPlatform } from '../../../injected/integration-test/playwright/type-helpers.mjs'
+import { perPlatform } from '../../../injected/integration-test/type-helpers.mjs'
 import { join } from 'node:path'
 import { expect } from '@playwright/test'
 
 /**
- * @typedef {import('../../../injected/integration-test/playwright/type-helpers.mjs').Build} Build
- * @typedef {import('../../../injected/integration-test/playwright/type-helpers.mjs').PlatformInfo} PlatformInfo
+ * @typedef {import('../../../injected/integration-test/type-helpers.mjs').Build} Build
+ * @typedef {import('../../../injected/integration-test/type-helpers.mjs').PlatformInfo} PlatformInfo
  */
 
 export class OnboardingPage {

special-pages/tests/page-objects/release-notes.js

@@ -1,12 +1,12 @@
 import { Mocks } from './mocks.js'
-import { perPlatform } from '../../../injected/integration-test/playwright/type-helpers.mjs'
+import { perPlatform } from '../../../injected/integration-test/type-helpers.mjs'
 import { join } from 'node:path'
 import { expect } from '@playwright/test'
 import { sampleData } from '../../pages/release-notes/app/sampleData.js'
 
 /**
- * @typedef {import('../../../injected/integration-test/playwright/type-helpers.mjs').Build} Build
- * @typedef {import('../../../injected/integration-test/playwright/type-helpers.mjs').PlatformInfo} PlatformInfo
+ * @typedef {import('../../../injected/integration-test/type-helpers.mjs').Build} Build
+ * @typedef {import('../../../injected/integration-test/type-helpers.mjs').PlatformInfo} PlatformInfo
  * @typedef {import('../../types/release-notes').UpdateMessage} UpdateMessage
  */
 

special-pages/tests/page-objects/special-error.js

@@ -1,15 +1,15 @@
 import { Mocks } from './mocks.js'
 import { expect } from '@playwright/test'
-import { perPlatform } from '../../../injected/integration-test/playwright/type-helpers.mjs'
+import { perPlatform } from '../../../injected/integration-test/type-helpers.mjs'
 import { join } from 'node:path'
 import { sampleData } from '../../pages/special-error/src/js/sampleData'
 import { createRequire } from 'node:module'
 import { readFileSync } from 'node:fs'
 const require = createRequire(import.meta.url)
 
 /**
- * @typedef {import('../../../injected/integration-test/playwright/type-helpers.mjs').Build} Build
- * @typedef {import('../../../injected/integration-test/playwright/type-helpers.mjs').PlatformInfo} PlatformInfo
+ * @typedef {import('../../../injected/integration-test/type-helpers.mjs').Build} Build
+ * @typedef {import('../../../injected/integration-test/type-helpers.mjs').PlatformInfo} PlatformInfo
  */
 
 export class SpecialErrorPage {