Commit ef04d6d813b for woocommerce
commit ef04d6d813b28eadac23a1f2d4838748d80bbced
Author: theAverageDev (Luca Tumedei) <luca.tumedei@automattic.com>
Date: Tue Jun 23 10:36:59 2026 +0200
Rename the e2e test directory from e2e-pw to e2e (#65844)
* QAO-408: rename plugins/woocommerce/tests/e2e-pw to tests/e2e
Pure git mv (content-identical) so git log --follow traces history across
the move. Reference rewrites land in the next commit.
* QAO-408: repoint e2e-pw references to e2e; drop orphaned blocks wp-env
- Rewrite every remaining e2e-pw path reference to e2e: package.json scripts +
CI changes/resultsPath rows, .wp-env.json mounts, phpcs.xml, tsconfig alias,
project-pr-labeler, runtime path consumers, docs, monorepo-utils fixtures.
- Delete orphaned client/blocks/.wp-env.json (its config was merged into the core
.wp-env.json by #65755) and remove its now-dead .wp-env.json CI trigger glob.
- Drop legacy /tests/e2e/** from .eslintignore so the renamed suite stays linted.
- Repoint client/blocks docs that pointed at the moved/deleted blocks e2e tree.
* QAO-408: changelog entries (dev)
* QAO-408: fix pre-existing markdownlint violations in touched docs
The directory rename surfaced existing markdownlint debt in docs that
were modified/renamed (whole files get linted). Fix MD040, MD033, MD034
and MD059 to unblock the Validate markdown check.
* QAO-408: exclude tests/e2e/bin from phpcs
The dir rename surfaces the moved e2e helper scripts as added files, so the
branch-level phpcs-changed lints them whole and flags pre-existing violations
that were never enforced (CI only runs changed-files lint, never full phpcs).
Exclude tests/e2e/bin/ alongside the existing e2e fixture exclusions; test-only
helper scripts, no shipped-code change.
* QAO-408: fix stale e2e references in contributor docs
* QAO-408: fix latent eslint errors in renamed e2e suite
diff --git a/.ai/skills/woocommerce-email-editor/SKILL.md b/.ai/skills/woocommerce-email-editor/SKILL.md
index a020bad4b81..befc7354ad5 100644
--- a/.ai/skills/woocommerce-email-editor/SKILL.md
+++ b/.ai/skills/woocommerce-email-editor/SKILL.md
@@ -53,7 +53,7 @@ Add to `plugins/woocommerce/.wp-env.override.json`:
```json
{
"lifecycleScripts": {
- "afterStart": "./tests/e2e-pw/bin/test-env-setup.sh && wp-env run cli wp plugin install wp-mail-smtp --activate"
+ "afterStart": "./tests/e2e/bin/test-env-setup.sh && wp-env run cli wp plugin install wp-mail-smtp --activate"
},
"config": {
"WPMS_ON": true,
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 0fc1f80f9ed..9538ee58999 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -29,7 +29,7 @@ Please take a moment to review the [project readme](https://github.com/woocommer
- [Naming conventions](https://developer.woocommerce.com/docs/contribution/contributing/naming-conventions/)
- [String localisation guidelines](https://developer.woocommerce.com/docs/contribution/contributing/string-localisation-guidelines/)
- [Running unit tests](https://github.com/woocommerce/woocommerce/blob/trunk/plugins/woocommerce/tests/README.md)
-- [Running e2e tests](https://github.com/woocommerce/woocommerce/tree/trunk/plugins/woocommerce/tests/e2e-pw#guide-for-writing-e2e-tests)
+- [Running e2e tests](https://github.com/woocommerce/woocommerce/tree/trunk/plugins/woocommerce/tests/e2e#writing-e2e-tests)
## Coding Guidelines and Development ðŸ›
@@ -39,8 +39,8 @@ Please take a moment to review the [project readme](https://github.com/woocommer
- Whenever possible, please fix pre-existing code standards errors in code that you change.
- Please consider adding appropriate tests related to your change if applicable such as unit, API and E2E tests. You can check the following resources for this purpose:
- [Writing unit tests](https://github.com/woocommerce/woocommerce/blob/trunk/plugins/woocommerce/tests/README.md#guide-for-writing-unit-tests).
- - [API tests](https://github.com/woocommerce/woocommerce/tree/trunk/plugins/woocommerce/tests/e2e-pw/tests/api-tests).
- - [Writing E2E tests](https://github.com/woocommerce/woocommerce/tree/trunk/plugins/woocommerce/tests/e2e-pw#guide-for-writing-e2e-tests).
+ - [API tests](https://github.com/woocommerce/woocommerce/tree/trunk/plugins/woocommerce/tests/e2e/tests/api-tests).
+ - [Writing E2E tests](https://github.com/woocommerce/woocommerce/tree/trunk/plugins/woocommerce/tests/e2e#writing-e2e-tests).
- Ensure you use LF line endings in your code editor. Use [EditorConfig](http://editorconfig.org/) if your editor supports it so that indentation, line endings and other settings are auto configured.
- When committing, reference your issue number (#1234) and include a note about the fix.
- Ensure that your code supports the minimum supported versions of PHP and WordPress; this is shown at the top of the `readme.txt` file.
diff --git a/.github/project-pr-labeler.yml b/.github/project-pr-labeler.yml
index ced0a43041a..dcf27d3984c 100644
--- a/.github/project-pr-labeler.yml
+++ b/.github/project-pr-labeler.yml
@@ -54,10 +54,10 @@
- plugins/woocommerce/tests/metrics/**/*
'focus: api tests':
- - plugins/woocommerce/tests/e2e-pw/tests/api-tests/**/*
+ - plugins/woocommerce/tests/e2e/tests/api-tests/**/*
'focus: e2e tests':
- - plugins/woocommerce/tests/e2e-pw/**/*
+ - plugins/woocommerce/tests/e2e/**/*
'Documentation':
- docs/**/*
diff --git a/.github/workflows/scripts/override-wp-env-plugins.js b/.github/workflows/scripts/override-wp-env-plugins.js
index 9d87332b9cd..9fbde16f6ac 100644
--- a/.github/workflows/scripts/override-wp-env-plugins.js
+++ b/.github/workflows/scripts/override-wp-env-plugins.js
@@ -32,7 +32,7 @@ const wpEnvConfig = JSON.parse( fs.readFileSync( configPath, 'utf8' ) );
// mapping (wp-env downloads and extracts it for us; the zip's top-level dir is
// `woocommerce/`, the same one WordPress core unzips for a real user) and drop
// the source entry from the plugin lists. Mapped plugins are not auto-activated,
-// so `tests/e2e-pw/bin/test-env-setup.sh` activates WooCommerce explicitly.
+// so `tests/e2e/bin/test-env-setup.sh` activates WooCommerce explicitly.
const wooCommerceEntries = [ '.', '../woocommerce' ];
let removed = 0;
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cf769e262fd..5c864e78332 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -97,7 +97,7 @@ pnpm --filter='@woocommerce/admin-library' test:js
pnpm --filter='@woocommerce/block-library' test:js
```
-See the [unit tests README](plugins/woocommerce/tests/README.md), [E2E tests README](plugins/woocommerce/tests/e2e-pw/README.md), and [performance tests README](plugins/woocommerce/tests/performance/README.md) for full details.
+See the [unit tests README](plugins/woocommerce/tests/README.md), [E2E tests README](plugins/woocommerce/tests/e2e/README.md), and [performance tests README](plugins/woocommerce/tests/performance/README.md) for full details.
## Linting and static analysis
@@ -138,7 +138,7 @@ For the full PR workflow, changelog conventions, and coding guidelines, see [Con
## Repository structure
-```
+```text
plugins/ # WordPress plugins
woocommerce/ # WooCommerce Core plugin
src/ # Modern PHP (PSR-4, DI container)
diff --git a/docs/contribution/testing/README.md b/docs/contribution/testing/README.md
index 519c8ff0106..a66d6a22c3e 100644
--- a/docs/contribution/testing/README.md
+++ b/docs/contribution/testing/README.md
@@ -16,11 +16,11 @@ If you have questions about testing, reach out to the developer community in our
## End-to-end testing
-[End-to-end tests](https://github.com/woocommerce/woocommerce/tree/trunk/plugins/woocommerce/tests/e2e-pw) are powered by Playwright. The test site is spun up using `wp-env`.
+[End-to-end tests](https://github.com/woocommerce/woocommerce/tree/trunk/plugins/woocommerce/tests/e2e) are powered by Playwright. The test site is spun up using `wp-env`.
## API testing
-[API tests](https://github.com/woocommerce/woocommerce/tree/trunk/plugins/woocommerce/tests/e2e-pw/tests/api-tests) are part of the Playwright suite and use the same `wp-env` test environment as end-to-end tests.
+[API tests](https://github.com/woocommerce/woocommerce/tree/trunk/plugins/woocommerce/tests/e2e/tests/api-tests) are part of the Playwright suite and use the same `wp-env` test environment as end-to-end tests.
## Testing instructions
diff --git a/packages/js/email-editor/changelog/qao-408-rename-e2e-pw-to-e2e b/packages/js/email-editor/changelog/qao-408-rename-e2e-pw-to-e2e
new file mode 100644
index 00000000000..81a193e7c7d
--- /dev/null
+++ b/packages/js/email-editor/changelog/qao-408-rename-e2e-pw-to-e2e
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Update the e2e test path in the writing-e2e-tests doc after the core e2e directory rename.
diff --git a/packages/js/email-editor/writing-e2e-tests.md b/packages/js/email-editor/writing-e2e-tests.md
index 521e09773d4..fbceb57cb81 100644
--- a/packages/js/email-editor/writing-e2e-tests.md
+++ b/packages/js/email-editor/writing-e2e-tests.md
@@ -70,7 +70,7 @@ test.describe('WooCommerce Email Editor', () => {
### 2. Test Organization
-- Place tests in `tests/e2e-pw/tests/email-editor/`
+- Place tests in `tests/e2e/tests/email-editor/`
- Use descriptive file names with `.spec.js` extension
- Group related tests using `test.describe()`
- Use helper functions for common operations
diff --git a/plugins/woocommerce/.eslintignore b/plugins/woocommerce/.eslintignore
index 653c1b5bfe3..ec4d3fca012 100644
--- a/plugins/woocommerce/.eslintignore
+++ b/plugins/woocommerce/.eslintignore
@@ -27,7 +27,6 @@
/client/legacy/js/stupidtable/**
/client/legacy/js/zoom/**
/includes/gateways/**
-/tests/e2e/**
/vendor/**
/client/admin/**
diff --git a/plugins/woocommerce/.wp-env.json b/plugins/woocommerce/.wp-env.json
index fd3d3f71030..2d8c73ff354 100644
--- a/plugins/woocommerce/.wp-env.json
+++ b/plugins/woocommerce/.wp-env.json
@@ -1,7 +1,7 @@
{
"core": "https://wordpress.org/wordpress-latest.zip",
"phpVersion": "8.1",
- "plugins": [ ".", "./tests/e2e-pw/test-plugins/wc-email-template-sync-test-helper" ],
+ "plugins": [ ".", "./tests/e2e/test-plugins/wc-email-template-sync-test-helper" ],
"config": {
"JETPACK_AUTOLOAD_DEV": true,
"WP_DEBUG_LOG": true,
@@ -9,15 +9,15 @@
"ALTERNATE_WP_CRON": true
},
"lifecycleScripts": {
- "afterStart": "./tests/e2e-pw/bin/test-env-setup.sh",
- "afterClean": "./tests/e2e-pw/bin/test-env-setup.sh"
+ "afterStart": "./tests/e2e/bin/test-env-setup.sh",
+ "afterClean": "./tests/e2e/bin/test-env-setup.sh"
},
"env": {
"tests": {
"port": 8086,
"plugins": [
".",
- "./tests/e2e-pw/test-plugins/wc-email-template-sync-test-helper",
+ "./tests/e2e/test-plugins/wc-email-template-sync-test-helper",
"https://downloads.wordpress.org/plugin/akismet.zip",
"https://github.com/WP-API/Basic-Auth/archive/master.zip",
"https://downloads.wordpress.org/plugin/wp-mail-logging.zip",
@@ -29,22 +29,22 @@
"ALTERNATE_WP_CRON": false
},
"mappings": {
- "wp-content/plugins/e2e-test-helpers": "./tests/e2e-pw/bin",
- "test-data/images/": "./tests/e2e-pw/test-data/images/",
- "wp-content/themes/emptytheme": "./tests/e2e-pw/themes/blocks/emptytheme",
- "wp-content/themes/theme-with-woo-templates": "./tests/e2e-pw/themes/blocks/theme-with-woo-templates",
- "wp-content/themes/storefront-child__block-notices-filter": "./tests/e2e-pw/themes/blocks/storefront-child__block-notices-filter",
- "wp-content/themes/storefront-child__block-notices-template": "./tests/e2e-pw/themes/blocks/storefront-child__block-notices-template",
- "wp-content/themes/storefront-child__classic-notices-template": "./tests/e2e-pw/themes/blocks/storefront-child__classic-notices-template",
- "wp-content/themes/storefront-child__with-block-template-part": "./tests/e2e-pw/themes/blocks/storefront-child__with-block-template-part",
- "wp-content/themes/storefront-child__with-block-template-part-support": "./tests/e2e-pw/themes/blocks/storefront-child__with-block-template-part-support",
- "wp-content/themes/twentytwentyfour-child__block-notices-filter": "./tests/e2e-pw/themes/blocks/twentytwentyfour-child__block-notices-filter",
- "wp-content/themes/twentytwentyfour-child__block-notices-template": "./tests/e2e-pw/themes/blocks/twentytwentyfour-child__block-notices-template",
- "wp-content/themes/twentytwentyfour-child__classic-notices-template": "./tests/e2e-pw/themes/blocks/twentytwentyfour-child__classic-notices-template",
+ "wp-content/plugins/e2e-test-helpers": "./tests/e2e/bin",
+ "test-data/images/": "./tests/e2e/test-data/images/",
+ "wp-content/themes/emptytheme": "./tests/e2e/themes/blocks/emptytheme",
+ "wp-content/themes/theme-with-woo-templates": "./tests/e2e/themes/blocks/theme-with-woo-templates",
+ "wp-content/themes/storefront-child__block-notices-filter": "./tests/e2e/themes/blocks/storefront-child__block-notices-filter",
+ "wp-content/themes/storefront-child__block-notices-template": "./tests/e2e/themes/blocks/storefront-child__block-notices-template",
+ "wp-content/themes/storefront-child__classic-notices-template": "./tests/e2e/themes/blocks/storefront-child__classic-notices-template",
+ "wp-content/themes/storefront-child__with-block-template-part": "./tests/e2e/themes/blocks/storefront-child__with-block-template-part",
+ "wp-content/themes/storefront-child__with-block-template-part-support": "./tests/e2e/themes/blocks/storefront-child__with-block-template-part-support",
+ "wp-content/themes/twentytwentyfour-child__block-notices-filter": "./tests/e2e/themes/blocks/twentytwentyfour-child__block-notices-filter",
+ "wp-content/themes/twentytwentyfour-child__block-notices-template": "./tests/e2e/themes/blocks/twentytwentyfour-child__block-notices-template",
+ "wp-content/themes/twentytwentyfour-child__classic-notices-template": "./tests/e2e/themes/blocks/twentytwentyfour-child__classic-notices-template",
"wp-content/themes/twentytwentyfour": "https://downloads.wordpress.org/theme/twentytwentyfour.latest-stable.zip",
"wp-content/plugins/woocommerce/blocks-bin": "./client/blocks/bin",
- "wp-content/plugins/woocommerce/blocks-bin/playwright": "./tests/e2e-pw/bin/blocks",
- "wp-content/plugins/woocommerce-blocks-test-plugins": "./tests/e2e-pw/test-plugins/blocks",
+ "wp-content/plugins/woocommerce/blocks-bin/playwright": "./tests/e2e/bin/blocks",
+ "wp-content/plugins/woocommerce-blocks-test-plugins": "./tests/e2e/test-plugins/blocks",
"wp-content/plugins/woocommerce/i18n/languages": "./i18n/languages"
}
}
diff --git a/plugins/woocommerce/changelog/qao-408-rename-e2e-pw-to-e2e b/plugins/woocommerce/changelog/qao-408-rename-e2e-pw-to-e2e
new file mode 100644
index 00000000000..dda39a02df4
--- /dev/null
+++ b/plugins/woocommerce/changelog/qao-408-rename-e2e-pw-to-e2e
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Rename the e2e test directory from e2e-pw to e2e and repoint all references; test-only, no changes to shipped code.
diff --git a/plugins/woocommerce/client/admin/README.md b/plugins/woocommerce/client/admin/README.md
index 7246d7c4cb8..6ee81c2da3e 100644
--- a/plugins/woocommerce/client/admin/README.md
+++ b/plugins/woocommerce/client/admin/README.md
@@ -8,7 +8,7 @@ Please refer to the [WooCommerce Admin Development](https://developer.woocommerc
## End-to-end tests
-Please refer to the [WooCommerce End to End Tests](https://github.com/woocommerce/woocommerce/blob/trunk/plugins/woocommerce/tests/e2e-pw/README.md).
+Please refer to the [WooCommerce End to End Tests](https://github.com/woocommerce/woocommerce/blob/trunk/plugins/woocommerce/tests/e2e/README.md).
## Common Issues
diff --git a/plugins/woocommerce/client/blocks/.wp-env.json b/plugins/woocommerce/client/blocks/.wp-env.json
deleted file mode 100644
index cca65933b43..00000000000
--- a/plugins/woocommerce/client/blocks/.wp-env.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "core": "https://wordpress.org/wordpress-latest.zip",
- "phpVersion": "7.4",
- "plugins": [
- "https://github.com/WP-API/Basic-Auth/archive/master.zip",
- "https://downloads.wordpress.org/plugin/wordpress-importer.0.8.zip",
- "../.."
- ],
- "env": {
- "tests": {
- "mappings": {
- "wp-cli.yml": "./wp-cli.yml",
- "wp-content/plugins/woocommerce/blocks-bin": "./bin",
- "wp-content/plugins/woocommerce/blocks-bin/playwright": "./tests/e2e/bin",
- "wp-content/plugins/woocommerce-blocks-test-plugins": "../../tests/e2e-pw/test-plugins/blocks",
- "wp-content/plugins/woocommerce-test-plugins": "../../tests/e2e-pw/bin",
- "wp-content/themes": "../../tests/e2e-pw/themes/blocks",
- "wp-content/themes/storefront": "https://downloads.wordpress.org/theme/storefront.latest-stable.zip",
- "wp-content/themes/twentytwentyfour": "https://downloads.wordpress.org/theme/twentytwentyfour.latest-stable.zip"
- }
- }
- }
-}
diff --git a/plugins/woocommerce/client/blocks/CLAUDE.md b/plugins/woocommerce/client/blocks/CLAUDE.md
index 063cbbc047e..dcdd595c69c 100644
--- a/plugins/woocommerce/client/blocks/CLAUDE.md
+++ b/plugins/woocommerce/client/blocks/CLAUDE.md
@@ -57,8 +57,7 @@ client/blocks/
│ ├── components/ # 23+ shared components
│ └── prices/ # Price formatting and currency
├── tests/
-│ ├── js/ # Jest unit tests
-│ └── e2e/ # Playwright E2E tests
+│ └── js/ # Jest unit tests
├── bin/ # Build scripts (webpack configs, ESLint plugin)
└── storybook/ # Storybook config
```
@@ -197,9 +196,9 @@ Webpack writes directly to `plugins/woocommerce/assets/client/blocks/` so PHP en
### Playwright E2E Tests
-- Config: `tests/e2e/playwright.config.ts`
+- Config: `../../tests/e2e/playwright.config.ts` (Blocks e2e now lives in the core e2e suite)
- Test themes: `block-theme`, `classic-theme`, `block-theme-with-templates`
-- Setup script: `tests/e2e/bin/test-env-setup.sh`
+- Setup script: `../../tests/e2e/bin/blocks/test-env-setup.sh`
- Uses MSW for API mocking, Allure for reporting
### PHP Tests
diff --git a/plugins/woocommerce/client/blocks/docs/contributors/e2e-guidelines.md b/plugins/woocommerce/client/blocks/docs/contributors/e2e-guidelines.md
index c735ca55764..c814b052962 100644
--- a/plugins/woocommerce/client/blocks/docs/contributors/e2e-guidelines.md
+++ b/plugins/woocommerce/client/blocks/docs/contributors/e2e-guidelines.md
@@ -99,7 +99,7 @@ We isolate our tests from each other by resetting the database to its initial st
### Plugins
-To use a custom plugin with your tests, first create the plugin PHP file and save it to the [test plugins folder](../../../../tests/e2e-pw/test-plugins/blocks/). Here's a handy snippet to help you get started:
+To use a custom plugin with your tests, first create the plugin PHP file and save it to the [test plugins folder](../../../../tests/e2e/test-plugins/blocks/). Here's a handy snippet to help you get started:
```php
// plugins/my-fancy-plugin.php
@@ -156,11 +156,11 @@ test.beforeEach( async ( { page, requestUtils } ) => {
#### Adding a new theme
-If you've created a custom theme and want to use it in your tests, save it in the [test themes folder](../../../../tests/e2e-pw/themes/blocks/). Check out the themes that are already there for inspiration. The activation part was explained above, so you're good to go!
+If you've created a custom theme and want to use it in your tests, save it in the [test themes folder](../../../../tests/e2e/themes/blocks/). Check out the themes that are already there for inspiration. The activation part was explained above, so you're good to go!
### Utilities
-We have a handful of [custom utilities](../../tests/e2e/utils/) built on top of core's [`@wordpress/e2e-test-utils-playwright`](https://github.com/WordPress/gutenberg/tree/HEAD/packages/e2e-test-utils-playwright), so make sure to familiarize yourself with them.
+We have a handful of [custom utilities](../../../../tests/e2e/utils/blocks/) built on top of core's [`@wordpress/e2e-test-utils-playwright`](https://github.com/WordPress/gutenberg/tree/HEAD/packages/e2e-test-utils-playwright), so make sure to familiarize yourself with them.
#### Creating new utilities
@@ -223,7 +223,7 @@ export class Editor extends CoreEditor {
### Content Templates
-We have created `RequestUtils.createPostFromFile()` and `RequestUtils.createTemplateFromFile()` utilities that enable creating complex content testing scenarios with Handlebars templates. The template files are kept in the [content-templates](../../../../tests/e2e-pw/content-templates/blocks/) folder, so you can head there for some inspiration.
+We have created `RequestUtils.createPostFromFile()` and `RequestUtils.createTemplateFromFile()` utilities that enable creating complex content testing scenarios with Handlebars templates. The template files are kept in the [content-templates](../../../../tests/e2e/content-templates/blocks/) folder, so you can head there for some inspiration.
> [!IMPORTANT]
> The Handlebars template filenames must be prefixed with the entity type. For posts, an example filename would be `post_with-filters.handlebars`, and for templates `template_archive-product_with-filters.handlebars`. Notice that the latter contains the slug of the template (`archive-product`) before the name (`with-filters`), separated with an underscore - it's necessary for the template to be properly loaded and created.
diff --git a/plugins/woocommerce/client/blocks/docs/contributors/folder-structure.md b/plugins/woocommerce/client/blocks/docs/contributors/folder-structure.md
index 10324759699..b06740db68f 100644
--- a/plugins/woocommerce/client/blocks/docs/contributors/folder-structure.md
+++ b/plugins/woocommerce/client/blocks/docs/contributors/folder-structure.md
@@ -49,9 +49,7 @@ The following snippet explains how the WooCommerce Blocks repository is structur
│ Docker config files for the development and testing environment.
│
├── .env
-├── .wp-env.json
-│ Config files for the development and testing environment.
-│ Includes WordPress, the WooCommerce plugin and the Storefront theme.
+│ Config file for the development and testing environment.
│
├── composer.lock
├── composer.json
@@ -170,9 +168,6 @@ The following snippet explains how the WooCommerce Blocks repository is structur
├── templates/emails
│ Email templates of the WooCommerce Blocks plugin.
│
-├── tests/e2e
-│ Set of end-to-end tests.
-│
├── tests/js
│ Configuration for Jest.
│
diff --git a/plugins/woocommerce/client/blocks/docs/contributors/javascript-testing.md b/plugins/woocommerce/client/blocks/docs/contributors/javascript-testing.md
index 5cc0a517bc6..7ebd0d5bdc4 100644
--- a/plugins/woocommerce/client/blocks/docs/contributors/javascript-testing.md
+++ b/plugins/woocommerce/client/blocks/docs/contributors/javascript-testing.md
@@ -3,10 +3,8 @@
## Table of contents <!-- omit in toc -->
- [How to run JavaScript unit tests](#how-to-run-javascript-unit-tests)
-- [How to run end-to-end tests with deprecated infrastructure](#how-to-run-end-to-end-tests-with-deprecated-infrastructure)
- [How to run end-to-end tests](#how-to-run-end-to-end-tests)
- [Debugging e2e tests using generated reports](#debugging-e2e-tests-using-generated-reports)
- - [Modify the local environment used by end-to-end tests](#modify-the-local-environment-used-by-end-to-end-tests)
- [WordPress versions and end-to-end tests suites](#wordpress-versions-and-end-to-end-tests-suites)
Tests for JavaScript in the Blocks plugin are powered by [Jest](https://jestjs.io/). The Blocks plugin follows the same patterns as Gutenberg, therefore for instructions on writing tests you can [refer to this page in the Gutenberg Handbook](https://developer.wordpress.org/block-editor/contributors/develop/testing-overview/).
@@ -37,33 +35,24 @@ Additionally,
- `test:update` updates the snapshot tests for components, used if you change a component that has tests attached.
- `test:watch` keeps watch of files and automatically re-runs tests when things change.
-## How to run end-to-end tests with deprecated infrastructure
-
-End-to-end tests are implemented in `tests/e2e-tests/specs/`.
-
-Since these drive the user interface, they need to run against a test environment - i.e. a web server running WordPress, Woo and blocks plugin, with a known state/configuration.
-
-To set up to run e2e tests:
-
-- `npm run build` builds the assets (js/css), you can exclude this step if you've already got built files to test with.
-- `npm run wp-env start` to start the test environment
-
- Then, to run the tests:
-
-- `npm run test:e2e`
-
-When you're iterating on a new test you'll often run this repeatedly, as you develop, until your test is just right.
+## How to run end-to-end tests
-Between tests, especially when they rely on the fixture data added, it might help to run `npm run wp-env clean`.
-When you're done, you may want to shut down the test environment:
+The Blocks end-to-end tests were merged into the WooCommerce Core e2e suite. They now
+live at `plugins/woocommerce/tests/e2e/tests/blocks/` and run through the shared
+Playwright config (`tests/e2e/playwright.config.ts`, project `blocks-chromium`).
-- `npm run wp-env stop` to stop the test environment
+From `plugins/woocommerce`:
-**Note:** There are a number of other useful `wp-env` commands. You can find out more in the [wp-env docs](https://github.com/WordPress/gutenberg/blob/trunk/packages/env/README.md).
+```bash
+# Start wp-env, run the Blocks test-env setup, and install the browser
+pnpm env:start:blocks
-## How to run end-to-end tests
+# Run the Blocks e2e suite
+pnpm test:e2e:blocks
+```
-Visit the [dedicated documentation](../../tests/e2e/README.md).
+For the full setup and available environments, see the
+[core e2e documentation](../../../../tests/e2e/README.md).
### Debugging e2e tests using generated reports
@@ -71,38 +60,18 @@ When e2e test suites are run in a GitHub automation, a report is generated autom
To access the reports, you should go to the _Details_ of a failed e2e test suite:
-<img src="https://user-images.githubusercontent.com/3616980/231486295-26b1d8fd-2420-4890-b143-a249cc990d20.png" alt="PR showing a failing test suite and the cursor over the Details button of that suite" width="780" />
+
From there, you can open the _Summary_ of the e2e test jobs:
-<img src="https://user-images.githubusercontent.com/3616980/231486308-8f85779b-8ede-440d-a250-6ff612d6ea20.png" alt="Log of an e2e test suite that failed, highlighting the Summary button" width="780" />
+
From the _Summary_ page, if you scroll down, you can download the report of each test suite that failed:
-<img src="https://user-images.githubusercontent.com/3616980/231486320-c52a0e10-c80e-4d3a-ae0f-b3998013f528.png" alt="Report summary showing the Artifacts list, including the e2e reports" width="780" />
+
That will download a ZIP that you can open in your browser locally.
-### Modify the local environment used by end-to-end tests
-
-To modify the environment used by tests locally, you will need to modify `.wp-env.json`. For example, you can set a specific WP version and install the latest Gutenberg version with these two lines:
-
-```diff
-{
-- "core": "WordPress/WordPress#5.7-branch",
-+ "core": "WordPress/WordPress#5.6-branch",
- "plugins": [
- "https://downloads.wordpress.org/plugin/woocommerce.latest-stable.zip",
- "https://github.com/WP-API/Basic-Auth/archive/master.zip",
-+ "https://downloads.wordpress.org/plugin/gutenberg.latest-stable.zip",
- "."
- ],
- ...
-}
-```
-
-You will need to stop `wp-env` and start it again. In some cases, you will also need to clean the database: `npm run wp-env clean all`.
-
### WordPress versions and end-to-end tests suites
Currently, we only run e2e tests with the most recent version of WordPress. We also have the infrastructure in place to run e2e tests with the most recent version of WordPress with Gutenberg installed, but [it's currently disabled](https://github.com/woocommerce/woocommerce-blocks/blob/07605450ffa4e460543980b7011b3bf8a8e82ff4/.github/workflows/php-js-e2e-tests.yml#L10).
diff --git a/plugins/woocommerce/client/blocks/package.json b/plugins/woocommerce/client/blocks/package.json
index 9fdb7e35e97..f2b20c95b99 100644
--- a/plugins/woocommerce/client/blocks/package.json
+++ b/plugins/woocommerce/client/blocks/package.json
@@ -322,7 +322,6 @@
"name": "JavaScript",
"command": "test:js",
"changes": [
- ".wp-env.json",
"webpack.config.js",
"babel.config.js",
"tsconfig.json",
diff --git a/plugins/woocommerce/client/blocks/tsconfig.base.json b/plugins/woocommerce/client/blocks/tsconfig.base.json
index 146c1fcab09..b5192f38bf3 100644
--- a/plugins/woocommerce/client/blocks/tsconfig.base.json
+++ b/plugins/woocommerce/client/blocks/tsconfig.base.json
@@ -146,7 +146,7 @@
"assets/js/utils"
],
"@woocommerce/e2e-utils": [
- "../../tests/e2e-pw/utils/blocks"
+ "../../tests/e2e/utils/blocks"
],
"@woocommerce/test-utils/msw": [
"tests/js/config/msw-setup"
diff --git a/plugins/woocommerce/package.json b/plugins/woocommerce/package.json
index 641eacbd782..56e6ff8019c 100644
--- a/plugins/woocommerce/package.json
+++ b/plugins/woocommerce/package.json
@@ -32,7 +32,7 @@
"env:performance-init": "./tests/performance/bin/init-environment.sh",
"env:restart": "pnpm wp-env destroy && pnpm wp-env start --update",
"env:start": "pnpm wp-env start",
- "env:start:blocks": "pnpm wp-env start && bash ./tests/e2e-pw/bin/blocks/test-env-setup.sh && pnpm playwright install chromium",
+ "env:start:blocks": "pnpm wp-env start && bash ./tests/e2e/bin/blocks/test-env-setup.sh && pnpm playwright install chromium",
"env:stop": "pnpm wp-env stop",
"env:test": "pnpm env:dev",
"env:perf": "pnpm env:dev && pnpm env:performance-init",
@@ -63,11 +63,11 @@
"test:e2e": "pnpm test:e2e:default --project=e2e",
"test:e2e:default": "pnpm test:e2e:install && pnpm test:e2e:with-env default",
"test:e2e:install": "pnpm playwright install chromium",
- "test:e2e:blocks": "pnpm playwright test --config=tests/e2e-pw/playwright.config.ts --project=blocks-chromium",
- "test:e2e:blocks:performance": "pnpm playwright test --config=tests/e2e-pw/playwright.performance.config.ts --project=blocks-performance",
+ "test:e2e:blocks": "pnpm playwright test --config=tests/e2e/playwright.config.ts --project=blocks-chromium",
+ "test:e2e:blocks:performance": "pnpm playwright test --config=tests/e2e/playwright.performance.config.ts --project=blocks-performance",
"test:e2e:email-update-propagation:pr": "pnpm test:e2e:default --project=e2e --grep @pr tests/email-editor/update-propagation",
"test:e2e:email-update-propagation:nightly": "pnpm test:e2e:default --project=e2e tests/email-editor/update-propagation",
- "test:e2e:with-env": "pnpm test:e2e:install && bash ./tests/e2e-pw/run-tests-with-env.sh",
+ "test:e2e:with-env": "pnpm test:e2e:install && bash ./tests/e2e/run-tests-with-env.sh",
"test:e2e:pressable": "pnpm test:e2e:with-env default-pressable",
"test:e2e:wpcom": "pnpm test:e2e:with-env default-wpcom",
"test:e2e:hpos-off": "pnpm test:e2e:with-env default-hpos-disabled --project=e2e-hpos-disabled",
@@ -75,7 +75,7 @@
"test:e2e:gb-nightly": "pnpm test:e2e:with-env gutenberg-nightly",
"ci:legacy-minicart-flag-off": "node ./bin/set-legacy-minicart-flag.js && php bin/generate-feature-config.php",
"test:e2e:legacy-mini-cart": "pnpm ci:legacy-minicart-flag-off && pnpm test:e2e:default --project=legacy-mini-cart",
- "test:e2e:blocks:legacy-mini-cart": "pnpm ci:legacy-minicart-flag-off && pnpm playwright test --config=tests/e2e-pw/playwright.config.ts --project=blocks-legacy-mini-cart",
+ "test:e2e:blocks:legacy-mini-cart": "pnpm ci:legacy-minicart-flag-off && pnpm playwright test --config=tests/e2e/playwright.config.ts --project=blocks-legacy-mini-cart",
"test:e2e:paypal-standard": "pnpm test:e2e:default --project=paypal-standard",
"test:php:legacy-mini-cart": "pnpm ci:legacy-minicart-flag-off && pnpm test:php:env",
"test:env:start": "pnpm env:test",
@@ -95,7 +95,7 @@
"test:unit:watch": "pnpm test:php:watch",
"test:unit:env": "pnpm test:php:env",
"test:unit:env:watch": "pnpm test:php:env:watch",
- "update-wp-env": "php ./tests/e2e-pw/bin/update-wp-env.php",
+ "update-wp-env": "php ./tests/e2e/bin/update-wp-env.php",
"watch:build": "pnpm watch:build:project",
"watch:build:admin": "pnpm watch:build:project:admin",
"watch:build:blocks": "pnpm watch:build:project:blocks",
@@ -288,7 +288,7 @@
"patterns/**/*.php",
"src/**/*.php",
"templates/**/*.php",
- "tests/e2e-pw/**",
+ "tests/e2e/**",
".wp-env.json",
"woocommerce.php",
"uninstall.php"
@@ -304,7 +304,7 @@
],
"report": {
"resultsBlobName": "core-e2e-report",
- "resultsPath": "tests/e2e-pw/test-results",
+ "resultsPath": "tests/e2e/test-results",
"allure": true
}
},
@@ -322,7 +322,7 @@
"patterns/**/*.php",
"src/**/*.php",
"templates/**/*.php",
- "tests/e2e-pw/**",
+ "tests/e2e/**",
".wp-env.json",
"woocommerce.php",
"uninstall.php"
@@ -336,7 +336,7 @@
],
"report": {
"resultsBlobName": "legacy-core-e2e-report",
- "resultsPath": "tests/e2e-pw/test-results",
+ "resultsPath": "tests/e2e/test-results",
"allure": true
}
},
@@ -349,7 +349,7 @@
"--shard=2/2"
],
"changes": [
- "tests/e2e-pw/**"
+ "tests/e2e/**"
],
"onlyForDependencies": [
"@woocommerce/e2e-utils-playwright"
@@ -365,7 +365,7 @@
},
"report": {
"resultsBlobName": "gutenberg-stable-e2e-report",
- "resultsPath": "tests/e2e-pw/test-results",
+ "resultsPath": "tests/e2e/test-results",
"allure": true
}
},
@@ -378,7 +378,7 @@
"--shard=2/2"
],
"changes": [
- "tests/e2e-pw/**"
+ "tests/e2e/**"
],
"onlyForDependencies": [
"@woocommerce/e2e-utils-playwright"
@@ -393,7 +393,7 @@
},
"report": {
"resultsBlobName": "gutenberg-nightly-e2e-report",
- "resultsPath": "tests/e2e-pw/test-results",
+ "resultsPath": "tests/e2e/test-results",
"allure": true
}
},
@@ -403,7 +403,7 @@
"command": "test:e2e:hpos-off",
"shardingArguments": [],
"changes": [
- "tests/e2e-pw/**"
+ "tests/e2e/**"
],
"onlyForDependencies": [
"@woocommerce/e2e-utils-playwright"
@@ -419,7 +419,7 @@
},
"report": {
"resultsBlobName": "core-e2e-reports-hpos-disabled",
- "resultsPath": "tests/e2e-pw/test-results",
+ "resultsPath": "tests/e2e/test-results",
"allure": true
}
},
@@ -435,7 +435,7 @@
"--shard=5/5"
],
"changes": [
- "tests/e2e-pw/**"
+ "tests/e2e/**"
],
"onlyForDependencies": [
"@woocommerce/e2e-utils-playwright"
@@ -454,7 +454,7 @@
],
"report": {
"resultsBlobName": "core-e2e-report-php-8.5",
- "resultsPath": "tests/e2e-pw/test-results",
+ "resultsPath": "tests/e2e/test-results",
"allure": true
}
},
@@ -470,7 +470,7 @@
"--shard=5/5"
],
"changes": [
- "tests/e2e-pw/**"
+ "tests/e2e/**"
],
"onlyForDependencies": [
"@woocommerce/e2e-utils-playwright"
@@ -489,7 +489,7 @@
],
"report": {
"resultsBlobName": "core-e2e-report-wp-latest-1",
- "resultsPath": "tests/e2e-pw/test-results",
+ "resultsPath": "tests/e2e/test-results",
"allure": true
}
},
@@ -506,7 +506,7 @@
"--shard=5/5"
],
"changes": [
- "tests/e2e-pw/**"
+ "tests/e2e/**"
],
"onlyForDependencies": [
"@woocommerce/e2e-utils-playwright"
@@ -525,7 +525,7 @@
],
"report": {
"resultsBlobName": "core-e2e-report-wp-pre-release",
- "resultsPath": "tests/e2e-pw/test-results",
+ "resultsPath": "tests/e2e/test-results",
"allure": true
}
},
@@ -540,10 +540,10 @@
"i18n/**/*.php",
"includes/**/*.php",
"src/**/*.php",
- "tests/e2e-pw/bin/**",
- "tests/e2e-pw/tests/api-tests/**",
- "tests/e2e-pw/*.js",
- "tests/e2e-pw/*.sh",
+ "tests/e2e/bin/**",
+ "tests/e2e/tests/api-tests/**",
+ "tests/e2e/*.js",
+ "tests/e2e/*.sh",
".wp-env.json",
"woocommerce.php",
"uninstall.php"
@@ -559,7 +559,7 @@
],
"report": {
"resultsBlobName": "core-api-report",
- "resultsPath": "tests/e2e-pw/test-results",
+ "resultsPath": "tests/e2e/test-results",
"allure": true
}
},
@@ -574,10 +574,10 @@
"i18n/**/*.php",
"includes/**/*.php",
"src/**/*.php",
- "tests/e2e-pw/bin/**",
- "tests/e2e-pw/tests/api-tests/**",
- "tests/e2e-pw/*.js",
- "tests/e2e-pw/*.sh",
+ "tests/e2e/bin/**",
+ "tests/e2e/tests/api-tests/**",
+ "tests/e2e/*.js",
+ "tests/e2e/*.sh",
".wp-env.json",
"woocommerce.php",
"uninstall.php"
@@ -592,7 +592,7 @@
},
"report": {
"resultsBlobName": "core-api-report-hpos-disabled",
- "resultsPath": "tests/e2e-pw/test-results",
+ "resultsPath": "tests/e2e/test-results",
"allure": true
}
},
@@ -639,10 +639,10 @@
"i18n/**/*.php",
"includes/**/*.php",
"src/**/*.php",
- "tests/e2e-pw/bin/**",
- "tests/e2e-pw/tests/api-tests/**",
- "tests/e2e-pw/*.js",
- "tests/e2e-pw/*.sh",
+ "tests/e2e/bin/**",
+ "tests/e2e/tests/api-tests/**",
+ "tests/e2e/*.js",
+ "tests/e2e/*.sh",
".wp-env.json",
"woocommerce.php",
"uninstall.php"
@@ -657,7 +657,7 @@
},
"report": {
"resultsBlobName": "core-api-report-object-cache",
- "resultsPath": "tests/e2e-pw/test-results",
+ "resultsPath": "tests/e2e/test-results",
"allure": true
}
},
@@ -735,15 +735,15 @@
"src/Blocks/**/*.php",
"templates/**/*.php",
"templates/**/*.html",
- "tests/e2e-pw/bin/blocks/**",
- "tests/e2e-pw/fixtures/blocks-setup.ts",
- "tests/e2e-pw/playwright.config.ts",
- "tests/e2e-pw/content-templates/blocks/**",
- "tests/e2e-pw/test-data/blocks/**",
- "tests/e2e-pw/test-plugins/blocks/**",
- "tests/e2e-pw/tests/blocks/**",
- "tests/e2e-pw/themes/blocks/**",
- "tests/e2e-pw/utils/blocks/**"
+ "tests/e2e/bin/blocks/**",
+ "tests/e2e/fixtures/blocks-setup.ts",
+ "tests/e2e/playwright.config.ts",
+ "tests/e2e/content-templates/blocks/**",
+ "tests/e2e/test-data/blocks/**",
+ "tests/e2e/test-plugins/blocks/**",
+ "tests/e2e/tests/blocks/**",
+ "tests/e2e/themes/blocks/**",
+ "tests/e2e/utils/blocks/**"
],
"onlyForDependencies": [
"@woocommerce/block-library"
@@ -762,7 +762,7 @@
],
"report": {
"resultsBlobName": "blocks-e2e-report",
- "resultsPath": "tests/e2e-pw/test-results",
+ "resultsPath": "tests/e2e/test-results",
"allure": true
}
},
@@ -781,15 +781,15 @@
"src/Blocks/**/*.php",
"templates/**/*.php",
"templates/**/*.html",
- "tests/e2e-pw/bin/blocks/**",
- "tests/e2e-pw/fixtures/blocks-setup.ts",
- "tests/e2e-pw/playwright.config.ts",
- "tests/e2e-pw/content-templates/blocks/**",
- "tests/e2e-pw/test-data/blocks/**",
- "tests/e2e-pw/test-plugins/blocks/**",
- "tests/e2e-pw/tests/blocks/**",
- "tests/e2e-pw/themes/blocks/**",
- "tests/e2e-pw/utils/blocks/**"
+ "tests/e2e/bin/blocks/**",
+ "tests/e2e/fixtures/blocks-setup.ts",
+ "tests/e2e/playwright.config.ts",
+ "tests/e2e/content-templates/blocks/**",
+ "tests/e2e/test-data/blocks/**",
+ "tests/e2e/test-plugins/blocks/**",
+ "tests/e2e/tests/blocks/**",
+ "tests/e2e/themes/blocks/**",
+ "tests/e2e/utils/blocks/**"
],
"onlyForDependencies": [
"@woocommerce/block-library"
@@ -806,7 +806,7 @@
],
"report": {
"resultsBlobName": "legacy-blocks-e2e-report",
- "resultsPath": "tests/e2e-pw/test-results",
+ "resultsPath": "tests/e2e/test-results",
"allure": true
}
},
@@ -828,15 +828,15 @@
"--shard=10/10"
],
"changes": [
- "tests/e2e-pw/bin/blocks/**",
- "tests/e2e-pw/fixtures/blocks-setup.ts",
- "tests/e2e-pw/playwright.config.ts",
- "tests/e2e-pw/content-templates/blocks/**",
- "tests/e2e-pw/test-data/blocks/**",
- "tests/e2e-pw/test-plugins/blocks/**",
- "tests/e2e-pw/tests/blocks/**",
- "tests/e2e-pw/themes/blocks/**",
- "tests/e2e-pw/utils/blocks/**"
+ "tests/e2e/bin/blocks/**",
+ "tests/e2e/fixtures/blocks-setup.ts",
+ "tests/e2e/playwright.config.ts",
+ "tests/e2e/content-templates/blocks/**",
+ "tests/e2e/test-data/blocks/**",
+ "tests/e2e/test-plugins/blocks/**",
+ "tests/e2e/tests/blocks/**",
+ "tests/e2e/themes/blocks/**",
+ "tests/e2e/utils/blocks/**"
],
"onlyForDependencies": [],
"testEnv": {
@@ -854,7 +854,7 @@
],
"report": {
"resultsBlobName": "blocks-e2e-report-wp-pre-release",
- "resultsPath": "tests/e2e-pw/test-results",
+ "resultsPath": "tests/e2e/test-results",
"allure": true
}
},
@@ -875,15 +875,15 @@
"--shard=10/10"
],
"changes": [
- "tests/e2e-pw/bin/blocks/**",
- "tests/e2e-pw/fixtures/blocks-setup.ts",
- "tests/e2e-pw/playwright.config.ts",
- "tests/e2e-pw/content-templates/blocks/**",
- "tests/e2e-pw/test-data/blocks/**",
- "tests/e2e-pw/test-plugins/blocks/**",
- "tests/e2e-pw/tests/blocks/**",
- "tests/e2e-pw/themes/blocks/**",
- "tests/e2e-pw/utils/blocks/**"
+ "tests/e2e/bin/blocks/**",
+ "tests/e2e/fixtures/blocks-setup.ts",
+ "tests/e2e/playwright.config.ts",
+ "tests/e2e/content-templates/blocks/**",
+ "tests/e2e/test-data/blocks/**",
+ "tests/e2e/test-plugins/blocks/**",
+ "tests/e2e/tests/blocks/**",
+ "tests/e2e/themes/blocks/**",
+ "tests/e2e/utils/blocks/**"
],
"onlyForDependencies": [],
"testEnv": {
@@ -901,7 +901,7 @@
],
"report": {
"resultsBlobName": "blocks-e2e-report-wp-latest-1",
- "resultsPath": "tests/e2e-pw/test-results",
+ "resultsPath": "tests/e2e/test-results",
"allure": true
}
},
@@ -916,7 +916,7 @@
],
"report": {
"resultsBlobName": "default-pressable-core-e2e-and-api",
- "resultsPath": "tests/e2e-pw/test-results",
+ "resultsPath": "tests/e2e/test-results",
"allure": true
}
},
@@ -931,7 +931,7 @@
],
"report": {
"resultsBlobName": "default-wpcom-core-e2e-and-api",
- "resultsPath": "tests/e2e-pw/test-results",
+ "resultsPath": "tests/e2e/test-results",
"allure": true
}
},
@@ -943,7 +943,7 @@
"changes": [
"includes/gateways/paypal/**/*.php",
"src/Gateways/PayPal/**/*.php",
- "tests/e2e-pw/tests/paypal/**"
+ "tests/e2e/tests/paypal/**"
],
"events": [
"pull_request",
@@ -956,7 +956,7 @@
},
"report": {
"resultsBlobName": "core-e2e-report",
- "resultsPath": "tests/e2e-pw/test-results",
+ "resultsPath": "tests/e2e/test-results",
"allure": true
}
}
diff --git a/plugins/woocommerce/phpcs.xml b/plugins/woocommerce/phpcs.xml
index 060886aa6b6..59385c5e13b 100644
--- a/plugins/woocommerce/phpcs.xml
+++ b/plugins/woocommerce/phpcs.xml
@@ -20,8 +20,10 @@
<!-- GraphQL test fixtures used only by unit tests. -->
<exclude-pattern>tests/php/src/Internal/Api/Fixtures/</exclude-pattern>
<!-- Fixture PHP files used in e2e tests. -->
- <exclude-pattern>tests/e2e-pw/themes/blocks/</exclude-pattern>
- <exclude-pattern>tests/e2e-pw/test-plugins/blocks/</exclude-pattern>
+ <exclude-pattern>tests/e2e/themes/blocks/</exclude-pattern>
+ <exclude-pattern>tests/e2e/test-plugins/blocks/</exclude-pattern>
+ <!-- Helper scripts loaded only during e2e tests. -->
+ <exclude-pattern>tests/e2e/bin/</exclude-pattern>
<!-- Only check PHP files. -->
<arg name="extensions" value="php" />
diff --git a/plugins/woocommerce/tests/README.md b/plugins/woocommerce/tests/README.md
index dbb06f8148f..7514e0d8eef 100644
--- a/plugins/woocommerce/tests/README.md
+++ b/plugins/woocommerce/tests/README.md
@@ -1,6 +1,6 @@
# WooCommerce Tests
-This document discusses unit tests. See [the e2e-pw README](https://github.com/woocommerce/woocommerce/blob/trunk/plugins/woocommerce/tests/e2e-pw/README.md) to learn how to setup testing environment for running e2e tests and run them.
+This document discusses unit tests. See [the e2e README](https://github.com/woocommerce/woocommerce/blob/trunk/plugins/woocommerce/tests/e2e/README.md) to learn how to setup testing environment for running e2e tests and run them.
## Table of contents
@@ -175,7 +175,7 @@ General guidelines for all the unit tests:
- Prefer `assertSame()` where possible as it tests both type and value
- Remember that only methods prefixed with `test` will be run so use helper methods liberally to keep test methods small and reduce code duplication. If there is a common helper method used in multiple test files, consider adding it to the `WC_Unit_Test_Case` class so it can be shared by all test cases
- Filters persist between test cases so be sure to remove them in your test method or in the `tearDown()` method.
-- Use data providers where possible. Be sure that their name is like `data_provider_function_to_test` (i.e. the data provider for `test_is_postcode` would be `data_provider_test_is_postcode`). Read more about data providers [here](https://phpunit.de/manual/current/en/writing-tests-for-phpunit.html#writing-tests-for-phpunit.data-providers).
+- Use data providers where possible. Be sure that their name is like `data_provider_function_to_test` (i.e. the data provider for `test_is_postcode` would be `data_provider_test_is_postcode`). Read more about data providers in the [PHPUnit manual](https://phpunit.de/manual/current/en/writing-tests-for-phpunit.html#writing-tests-for-phpunit.data-providers).
## Automated Tests
diff --git a/plugins/woocommerce/tests/e2e-pw/.eslintrc.cjs b/plugins/woocommerce/tests/e2e/.eslintrc.cjs
similarity index 97%
rename from plugins/woocommerce/tests/e2e-pw/.eslintrc.cjs
rename to plugins/woocommerce/tests/e2e/.eslintrc.cjs
index 8a6d775d1e4..7d89b57b875 100644
--- a/plugins/woocommerce/tests/e2e-pw/.eslintrc.cjs
+++ b/plugins/woocommerce/tests/e2e/.eslintrc.cjs
@@ -16,7 +16,7 @@ module.exports = {
'jest/valid-title': 'off',
'testing-library/await-async-utils': 'off',
/*
- * The e2e-pw tests use dependencies from the parent woocommerce package
+ * The e2e tests use dependencies from the parent woocommerce package
* (this directory has no package.json of its own). Resolve packageDir from
* __dirname so the check is independent of ESLint's working directory: VS
* Code / root-level ESLint can run from the monorepo root, and relative
diff --git a/plugins/woocommerce/tests/e2e-pw/.gitignore b/plugins/woocommerce/tests/e2e/.gitignore
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/.gitignore
rename to plugins/woocommerce/tests/e2e/.gitignore
diff --git a/plugins/woocommerce/tests/e2e-pw/README.md b/plugins/woocommerce/tests/e2e/README.md
similarity index 91%
rename from plugins/woocommerce/tests/e2e-pw/README.md
rename to plugins/woocommerce/tests/e2e/README.md
index c7e0c6f77cd..cff29433e50 100644
--- a/plugins/woocommerce/tests/e2e-pw/README.md
+++ b/plugins/woocommerce/tests/e2e/README.md
@@ -53,7 +53,7 @@ Other ways of running tests (make sure you are in the `plugins/woocommerce` fold
- `pnpm test:e2e --headed` (headed -- displaying browser window and test interactions)
- `pnpm test:e2e --debug` (runs tests in debug mode)
- `pnpm test:e2e page-loads.spec.ts` (runs a single test file - `page-loads.spec.ts` in this case)
-- `pnpm test:e2e ./tests/e2e-pw/tests/merchant` (runs all tests that are found in the `merchant` folder)
+- `pnpm test:e2e ./tests/e2e/tests/merchant` (runs all tests that are found in the `merchant` folder)
- `pnpm test:e2e --ui` (open tests in [Playwright UI mode](https://playwright.dev/docs/test-ui-mode)).
To see all the Playwright options, make sure you are in the `plugins/woocommerce` folder and
@@ -83,7 +83,7 @@ The test site URL and the credentials can be set via environment variables. If n
as configured in the `test-data/data.js` file.
If you'd like to overwrite the default values to run against a different environment (external host for
-example), you can create a `.env` file in `tests/e2e-pw/`:
+example), you can create a `.env` file in `tests/e2e/`:
```bash
BASE_URL='https://www.example.com'
@@ -98,7 +98,7 @@ CUSTOMER_PASSWORD='customer.password'
> file you should read further on how to create an alternative env, or you should run the tests using the raw Playwright
> command: `pnpm playwright ...`
-There are some pre-defined environments set in the `tests/e2e-pw/envs` path.
+There are some pre-defined environments set in the `tests/e2e/envs` path.
Each folder represents an environment, and contains a setup script, a `playwright.config.js` file and optionally an
encrypted `.env` file.
Running the tests with one of these environments will first decrypt the `.env.enc` file if it exists, execute the setup
@@ -132,8 +132,8 @@ E2E_ENV_KEY='your-key' pnpm test:e2e:with-env default-pressable
If you need to create a new pre-defined environment, you can follow these steps:
-- create a new folder in the `tests/e2e-pw/envs` directory with the name of the environment.
- Example: `tests/e2e-pw/envs/my-new-env`
+- create a new folder in the `tests/e2e/envs` directory with the name of the environment.
+ Example: `tests/e2e/envs/my-new-env`
- create an `env-setup.sh` file in the new folder. This file should contain any setup steps for the environment. This
will run before any test execution.
- create a `playwright.config.ts` file in the new folder. This file should contain the configuration for the
@@ -143,9 +143,9 @@ If you need to create a new pre-defined environment, you can follow these steps:
> [!NOTE]
> If you previously created a custom environment with a `playwright.config.js` file, it will still work — the test runner falls back to `.js` when no `.ts` config is found. However, new environments should use `.ts`.
-- if you need to store an encrypted `.env` file, first create the `.env` file in the `tests/e2e-pw` folder, then
- run `E2E_ENV_KEY='your-key' ./tests/e2e-pw/bin/dotenv.sh -e my-new-env`. This script command will encrypt the `.env`
- file into `tests/e2e-pw/envs/my-new-env/.env.enc`.
+- if you need to store an encrypted `.env` file, first create the `.env` file in the `tests/e2e` folder, then
+ run `E2E_ENV_KEY='your-key' ./tests/e2e/bin/dotenv.sh -e my-new-env`. This script command will encrypt the `.env`
+ file into `tests/e2e/envs/my-new-env/.env.enc`.
> [!TIP]
> Creating an environment directory starting with `_local` will make it ignored by git, so you can store your local environment configurations without worrying about accidentally committing them.
@@ -170,7 +170,7 @@ read: [Playwright Best Practices](https://playwright.dev/docs/best-practices).
## Test helper plugins
-Some E2E suites need fixture mechanisms that can't be expressed cleanly with REST or WP-CLI alone — for example, filter-driven content overrides, server-side event mirroring, or synchronous triggers for normally-scheduled jobs. These ship as small PHP plugins under `tests/e2e-pw/test-plugins/`, mounted via `.wp-env.json`'s `plugins` array.
+Some E2E suites need fixture mechanisms that can't be expressed cleanly with REST or WP-CLI alone — for example, filter-driven content overrides, server-side event mirroring, or synchronous triggers for normally-scheduled jobs. These ship as small PHP plugins under `tests/e2e/test-plugins/`, mounted via `.wp-env.json`'s `plugins` array.
### `wc-email-template-sync-test-helper`
@@ -217,7 +217,7 @@ use the following commands:
```bash
cd plugins/woocommerce
-pnpm exec playwright show-report tests/e2e-pw/test-results/playwright-report
+pnpm exec playwright show-report tests/e2e/test-results/playwright-report
```
For more details about the Playwright HTML report, see
@@ -235,13 +235,13 @@ Use the `allure generate` command to generate an HTML report from the `allure-re
the test run. Then, use the `allure open` command to open it on your browser. For example, assuming that:
- You're at the root of the WooCommerce monorepo
-- You want to generate the `allure-report` folder in `plugins/woocommerce/tests/e2e-pw/test-results`
+- You want to generate the `allure-report` folder in `plugins/woocommerce/tests/e2e/test-results`
Then you would need to use the following commands:
```bash
-pnpm exec allure generate --clean plugins/woocommerce/tests/e2e-pw/test-results/allure-results --output plugins/woocommerce/tests/e2e-pw/test-results/allure-report
-pnpm exec allure open plugins/woocommerce/tests/e2e-pw/test-results/allure-report
+pnpm exec allure generate --clean plugins/woocommerce/tests/e2e/test-results/allure-results --output plugins/woocommerce/tests/e2e/test-results/allure-report
+pnpm exec allure open plugins/woocommerce/tests/e2e/test-results/allure-report
```
A browser window should open the Allure report.
diff --git a/plugins/woocommerce/tests/e2e-pw/WSL_SETUP_INSTRUCTIONS.md b/plugins/woocommerce/tests/e2e/WSL_SETUP_INSTRUCTIONS.md
similarity index 87%
rename from plugins/woocommerce/tests/e2e-pw/WSL_SETUP_INSTRUCTIONS.md
rename to plugins/woocommerce/tests/e2e/WSL_SETUP_INSTRUCTIONS.md
index fdb60bb1178..ce351f57f23 100644
--- a/plugins/woocommerce/tests/e2e-pw/WSL_SETUP_INSTRUCTIONS.md
+++ b/plugins/woocommerce/tests/e2e/WSL_SETUP_INSTRUCTIONS.md
@@ -6,9 +6,9 @@ You can set up a local development environment on Windows with [Windows Subsyste
You should have the following already set up on your Windows computer:
-- **Docker Desktop for Windows** - https://docs.docker.com/docker-for-windows/install/
-- **WSL 2** - https://docs.microsoft.com/en-us/windows/wsl/install
-- **Set the default Linux distribution** - https://docs.microsoft.com/en-us/windows/wsl/basic-commands#set-default-linux-distribution
+- **Docker Desktop for Windows** - <https://docs.docker.com/docker-for-windows/install/>
+- **WSL 2** - <https://docs.microsoft.com/en-us/windows/wsl/install>
+- **Set the default Linux distribution** - <https://docs.microsoft.com/en-us/windows/wsl/basic-commands#set-default-linux-distribution>
## Setup Steps
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/blocks/generate-test-translations.js b/plugins/woocommerce/tests/e2e/bin/blocks/generate-test-translations.js
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/blocks/generate-test-translations.js
rename to plugins/woocommerce/tests/e2e/bin/blocks/generate-test-translations.js
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/blocks/pages/cart-shortcode.html b/plugins/woocommerce/tests/e2e/bin/blocks/pages/cart-shortcode.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/blocks/pages/cart-shortcode.html
rename to plugins/woocommerce/tests/e2e/bin/blocks/pages/cart-shortcode.html
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/blocks/pages/cart.html b/plugins/woocommerce/tests/e2e/bin/blocks/pages/cart.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/blocks/pages/cart.html
rename to plugins/woocommerce/tests/e2e/bin/blocks/pages/cart.html
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/blocks/pages/checkout-shortcode.html b/plugins/woocommerce/tests/e2e/bin/blocks/pages/checkout-shortcode.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/blocks/pages/checkout-shortcode.html
rename to plugins/woocommerce/tests/e2e/bin/blocks/pages/checkout-shortcode.html
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/blocks/pages/checkout.html b/plugins/woocommerce/tests/e2e/bin/blocks/pages/checkout.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/blocks/pages/checkout.html
rename to plugins/woocommerce/tests/e2e/bin/blocks/pages/checkout.html
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/blocks/pages/mini-cart.html b/plugins/woocommerce/tests/e2e/bin/blocks/pages/mini-cart.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/blocks/pages/mini-cart.html
rename to plugins/woocommerce/tests/e2e/bin/blocks/pages/mini-cart.html
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/blocks/pages/my-account.html b/plugins/woocommerce/tests/e2e/bin/blocks/pages/my-account.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/blocks/pages/my-account.html
rename to plugins/woocommerce/tests/e2e/bin/blocks/pages/my-account.html
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/blocks/posts/product-collection.html b/plugins/woocommerce/tests/e2e/bin/blocks/posts/product-collection.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/blocks/posts/product-collection.html
rename to plugins/woocommerce/tests/e2e/bin/blocks/posts/product-collection.html
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/attributes.sh b/plugins/woocommerce/tests/e2e/bin/blocks/scripts/attributes.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/attributes.sh
rename to plugins/woocommerce/tests/e2e/bin/blocks/scripts/attributes.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/index.sh b/plugins/woocommerce/tests/e2e/bin/blocks/scripts/index.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/index.sh
rename to plugins/woocommerce/tests/e2e/bin/blocks/scripts/index.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/parallel/blog-name.sh b/plugins/woocommerce/tests/e2e/bin/blocks/scripts/parallel/blog-name.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/parallel/blog-name.sh
rename to plugins/woocommerce/tests/e2e/bin/blocks/scripts/parallel/blog-name.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/parallel/coupon.sh b/plugins/woocommerce/tests/e2e/bin/blocks/scripts/parallel/coupon.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/parallel/coupon.sh
rename to plugins/woocommerce/tests/e2e/bin/blocks/scripts/parallel/coupon.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/parallel/customer.sh b/plugins/woocommerce/tests/e2e/bin/blocks/scripts/parallel/customer.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/parallel/customer.sh
rename to plugins/woocommerce/tests/e2e/bin/blocks/scripts/parallel/customer.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/parallel/languages.sh b/plugins/woocommerce/tests/e2e/bin/blocks/scripts/parallel/languages.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/parallel/languages.sh
rename to plugins/woocommerce/tests/e2e/bin/blocks/scripts/parallel/languages.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/parallel/pages.sh b/plugins/woocommerce/tests/e2e/bin/blocks/scripts/parallel/pages.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/parallel/pages.sh
rename to plugins/woocommerce/tests/e2e/bin/blocks/scripts/parallel/pages.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/parallel/payment.sh b/plugins/woocommerce/tests/e2e/bin/blocks/scripts/parallel/payment.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/parallel/payment.sh
rename to plugins/woocommerce/tests/e2e/bin/blocks/scripts/parallel/payment.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/parallel/posts.sh b/plugins/woocommerce/tests/e2e/bin/blocks/scripts/parallel/posts.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/parallel/posts.sh
rename to plugins/woocommerce/tests/e2e/bin/blocks/scripts/parallel/posts.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/parallel/reviews.sh b/plugins/woocommerce/tests/e2e/bin/blocks/scripts/parallel/reviews.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/parallel/reviews.sh
rename to plugins/woocommerce/tests/e2e/bin/blocks/scripts/parallel/reviews.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/parallel/shipping.sh b/plugins/woocommerce/tests/e2e/bin/blocks/scripts/parallel/shipping.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/parallel/shipping.sh
rename to plugins/woocommerce/tests/e2e/bin/blocks/scripts/parallel/shipping.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/parallel/tax.sh b/plugins/woocommerce/tests/e2e/bin/blocks/scripts/parallel/tax.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/parallel/tax.sh
rename to plugins/woocommerce/tests/e2e/bin/blocks/scripts/parallel/tax.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/products.sh b/plugins/woocommerce/tests/e2e/bin/blocks/scripts/products.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/products.sh
rename to plugins/woocommerce/tests/e2e/bin/blocks/scripts/products.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/rewrite.sh b/plugins/woocommerce/tests/e2e/bin/blocks/scripts/rewrite.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/rewrite.sh
rename to plugins/woocommerce/tests/e2e/bin/blocks/scripts/rewrite.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/blocks/test-env-setup.sh b/plugins/woocommerce/tests/e2e/bin/blocks/test-env-setup.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/blocks/test-env-setup.sh
rename to plugins/woocommerce/tests/e2e/bin/blocks/test-env-setup.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/dotenv.sh b/plugins/woocommerce/tests/e2e/bin/dotenv.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/dotenv.sh
rename to plugins/woocommerce/tests/e2e/bin/dotenv.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/filter-setter.php b/plugins/woocommerce/tests/e2e/bin/filter-setter.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/filter-setter.php
rename to plugins/woocommerce/tests/e2e/bin/filter-setter.php
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/install-plugin.sh b/plugins/woocommerce/tests/e2e/bin/install-plugin.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/install-plugin.sh
rename to plugins/woocommerce/tests/e2e/bin/install-plugin.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/process-waiting-actions.php b/plugins/woocommerce/tests/e2e/bin/process-waiting-actions.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/process-waiting-actions.php
rename to plugins/woocommerce/tests/e2e/bin/process-waiting-actions.php
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/test-env-setup-external.sh b/plugins/woocommerce/tests/e2e/bin/test-env-setup-external.sh
similarity index 90%
rename from plugins/woocommerce/tests/e2e-pw/bin/test-env-setup-external.sh
rename to plugins/woocommerce/tests/e2e/bin/test-env-setup-external.sh
index 6b498a73d75..0333be93afc 100755
--- a/plugins/woocommerce/tests/e2e-pw/bin/test-env-setup-external.sh
+++ b/plugins/woocommerce/tests/e2e/bin/test-env-setup-external.sh
@@ -46,7 +46,7 @@ for plugin in "${mu_plugins[@]}"; do
echo "Processing $plugin..."
# Download the PHP file
- curl -o "$plugin.php" "https://raw.githubusercontent.com/woocommerce/woocommerce/trunk/plugins/woocommerce/tests/e2e-pw/bin/$plugin.php"
+ curl -o "$plugin.php" "https://raw.githubusercontent.com/woocommerce/woocommerce/trunk/plugins/woocommerce/tests/e2e/bin/$plugin.php"
# Create a zip file
(chmod 755 "$plugin.php" && zip "${plugin%}.zip" "$plugin.php")
@@ -89,6 +89,6 @@ echo "--------------------------------------------------------"
echo -e 'Upload test images'
echo "--------------------------------------------------------"
echo "Importing test images..."
-wp media import https://raw.githubusercontent.com/woocommerce/woocommerce/trunk/plugins/woocommerce/tests/e2e-pw/test-data/images/image-01.png \
- https://raw.githubusercontent.com/woocommerce/woocommerce/trunk/plugins/woocommerce/tests/e2e-pw/test-data/images/image-02.png \
- https://raw.githubusercontent.com/woocommerce/woocommerce/trunk/plugins/woocommerce/tests/e2e-pw/test-data/images/image-03.png
+wp media import https://raw.githubusercontent.com/woocommerce/woocommerce/trunk/plugins/woocommerce/tests/e2e/test-data/images/image-01.png \
+ https://raw.githubusercontent.com/woocommerce/woocommerce/trunk/plugins/woocommerce/tests/e2e/test-data/images/image-02.png \
+ https://raw.githubusercontent.com/woocommerce/woocommerce/trunk/plugins/woocommerce/tests/e2e/test-data/images/image-03.png
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/test-env-setup.sh b/plugins/woocommerce/tests/e2e/bin/test-env-setup.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/test-env-setup.sh
rename to plugins/woocommerce/tests/e2e/bin/test-env-setup.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/test-helper-apis.php b/plugins/woocommerce/tests/e2e/bin/test-helper-apis.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/test-helper-apis.php
rename to plugins/woocommerce/tests/e2e/bin/test-helper-apis.php
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/woocommerce-cleanup.php b/plugins/woocommerce/tests/e2e/bin/woocommerce-cleanup.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/bin/woocommerce-cleanup.php
rename to plugins/woocommerce/tests/e2e/bin/woocommerce-cleanup.php
diff --git a/plugins/woocommerce/tests/e2e-pw/content-templates/blocks/post_filters-with-all-products.handlebars b/plugins/woocommerce/tests/e2e/content-templates/blocks/post_filters-with-all-products.handlebars
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/content-templates/blocks/post_filters-with-all-products.handlebars
rename to plugins/woocommerce/tests/e2e/content-templates/blocks/post_filters-with-all-products.handlebars
diff --git a/plugins/woocommerce/tests/e2e-pw/content-templates/blocks/template_archive-product_active-filters.handlebars b/plugins/woocommerce/tests/e2e/content-templates/blocks/template_archive-product_active-filters.handlebars
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/content-templates/blocks/template_archive-product_active-filters.handlebars
rename to plugins/woocommerce/tests/e2e/content-templates/blocks/template_archive-product_active-filters.handlebars
diff --git a/plugins/woocommerce/tests/e2e-pw/content-templates/blocks/template_archive-product_attribute-filter.handlebars b/plugins/woocommerce/tests/e2e/content-templates/blocks/template_archive-product_attribute-filter.handlebars
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/content-templates/blocks/template_archive-product_attribute-filter.handlebars
rename to plugins/woocommerce/tests/e2e/content-templates/blocks/template_archive-product_attribute-filter.handlebars
diff --git a/plugins/woocommerce/tests/e2e-pw/content-templates/blocks/template_archive-product_filters-with-product-collection.handlebars b/plugins/woocommerce/tests/e2e/content-templates/blocks/template_archive-product_filters-with-product-collection.handlebars
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/content-templates/blocks/template_archive-product_filters-with-product-collection.handlebars
rename to plugins/woocommerce/tests/e2e/content-templates/blocks/template_archive-product_filters-with-product-collection.handlebars
diff --git a/plugins/woocommerce/tests/e2e-pw/content-templates/blocks/template_archive-product_multiple-product-filters.handlebars b/plugins/woocommerce/tests/e2e/content-templates/blocks/template_archive-product_multiple-product-filters.handlebars
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/content-templates/blocks/template_archive-product_multiple-product-filters.handlebars
rename to plugins/woocommerce/tests/e2e/content-templates/blocks/template_archive-product_multiple-product-filters.handlebars
diff --git a/plugins/woocommerce/tests/e2e-pw/content-templates/blocks/template_archive-product_price-filter.handlebars b/plugins/woocommerce/tests/e2e/content-templates/blocks/template_archive-product_price-filter.handlebars
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/content-templates/blocks/template_archive-product_price-filter.handlebars
rename to plugins/woocommerce/tests/e2e/content-templates/blocks/template_archive-product_price-filter.handlebars
diff --git a/plugins/woocommerce/tests/e2e-pw/content-templates/blocks/template_archive-product_rating-filter.handlebars b/plugins/woocommerce/tests/e2e/content-templates/blocks/template_archive-product_rating-filter.handlebars
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/content-templates/blocks/template_archive-product_rating-filter.handlebars
rename to plugins/woocommerce/tests/e2e/content-templates/blocks/template_archive-product_rating-filter.handlebars
diff --git a/plugins/woocommerce/tests/e2e-pw/content-templates/blocks/template_archive-product_stock-status.handlebars b/plugins/woocommerce/tests/e2e/content-templates/blocks/template_archive-product_stock-status.handlebars
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/content-templates/blocks/template_archive-product_stock-status.handlebars
rename to plugins/woocommerce/tests/e2e/content-templates/blocks/template_archive-product_stock-status.handlebars
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ad.json b/plugins/woocommerce/tests/e2e/data/countries/ad.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ad.json
rename to plugins/woocommerce/tests/e2e/data/countries/ad.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ae.json b/plugins/woocommerce/tests/e2e/data/countries/ae.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ae.json
rename to plugins/woocommerce/tests/e2e/data/countries/ae.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/af.json b/plugins/woocommerce/tests/e2e/data/countries/af.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/af.json
rename to plugins/woocommerce/tests/e2e/data/countries/af.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ag.json b/plugins/woocommerce/tests/e2e/data/countries/ag.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ag.json
rename to plugins/woocommerce/tests/e2e/data/countries/ag.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ai.json b/plugins/woocommerce/tests/e2e/data/countries/ai.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ai.json
rename to plugins/woocommerce/tests/e2e/data/countries/ai.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/al.json b/plugins/woocommerce/tests/e2e/data/countries/al.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/al.json
rename to plugins/woocommerce/tests/e2e/data/countries/al.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/am.json b/plugins/woocommerce/tests/e2e/data/countries/am.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/am.json
rename to plugins/woocommerce/tests/e2e/data/countries/am.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ao.json b/plugins/woocommerce/tests/e2e/data/countries/ao.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ao.json
rename to plugins/woocommerce/tests/e2e/data/countries/ao.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/aq.json b/plugins/woocommerce/tests/e2e/data/countries/aq.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/aq.json
rename to plugins/woocommerce/tests/e2e/data/countries/aq.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ar.json b/plugins/woocommerce/tests/e2e/data/countries/ar.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ar.json
rename to plugins/woocommerce/tests/e2e/data/countries/ar.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/as.json b/plugins/woocommerce/tests/e2e/data/countries/as.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/as.json
rename to plugins/woocommerce/tests/e2e/data/countries/as.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/at.json b/plugins/woocommerce/tests/e2e/data/countries/at.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/at.json
rename to plugins/woocommerce/tests/e2e/data/countries/at.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/au.json b/plugins/woocommerce/tests/e2e/data/countries/au.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/au.json
rename to plugins/woocommerce/tests/e2e/data/countries/au.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/aw.json b/plugins/woocommerce/tests/e2e/data/countries/aw.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/aw.json
rename to plugins/woocommerce/tests/e2e/data/countries/aw.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ax.json b/plugins/woocommerce/tests/e2e/data/countries/ax.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ax.json
rename to plugins/woocommerce/tests/e2e/data/countries/ax.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/az.json b/plugins/woocommerce/tests/e2e/data/countries/az.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/az.json
rename to plugins/woocommerce/tests/e2e/data/countries/az.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ba.json b/plugins/woocommerce/tests/e2e/data/countries/ba.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ba.json
rename to plugins/woocommerce/tests/e2e/data/countries/ba.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/bb.json b/plugins/woocommerce/tests/e2e/data/countries/bb.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/bb.json
rename to plugins/woocommerce/tests/e2e/data/countries/bb.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/bd.json b/plugins/woocommerce/tests/e2e/data/countries/bd.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/bd.json
rename to plugins/woocommerce/tests/e2e/data/countries/bd.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/be.json b/plugins/woocommerce/tests/e2e/data/countries/be.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/be.json
rename to plugins/woocommerce/tests/e2e/data/countries/be.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/bf.json b/plugins/woocommerce/tests/e2e/data/countries/bf.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/bf.json
rename to plugins/woocommerce/tests/e2e/data/countries/bf.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/bg.json b/plugins/woocommerce/tests/e2e/data/countries/bg.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/bg.json
rename to plugins/woocommerce/tests/e2e/data/countries/bg.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/bh.json b/plugins/woocommerce/tests/e2e/data/countries/bh.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/bh.json
rename to plugins/woocommerce/tests/e2e/data/countries/bh.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/bi.json b/plugins/woocommerce/tests/e2e/data/countries/bi.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/bi.json
rename to plugins/woocommerce/tests/e2e/data/countries/bi.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/bj.json b/plugins/woocommerce/tests/e2e/data/countries/bj.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/bj.json
rename to plugins/woocommerce/tests/e2e/data/countries/bj.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/bl.json b/plugins/woocommerce/tests/e2e/data/countries/bl.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/bl.json
rename to plugins/woocommerce/tests/e2e/data/countries/bl.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/bm.json b/plugins/woocommerce/tests/e2e/data/countries/bm.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/bm.json
rename to plugins/woocommerce/tests/e2e/data/countries/bm.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/bn.json b/plugins/woocommerce/tests/e2e/data/countries/bn.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/bn.json
rename to plugins/woocommerce/tests/e2e/data/countries/bn.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/bo.json b/plugins/woocommerce/tests/e2e/data/countries/bo.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/bo.json
rename to plugins/woocommerce/tests/e2e/data/countries/bo.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/bq.json b/plugins/woocommerce/tests/e2e/data/countries/bq.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/bq.json
rename to plugins/woocommerce/tests/e2e/data/countries/bq.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/br.json b/plugins/woocommerce/tests/e2e/data/countries/br.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/br.json
rename to plugins/woocommerce/tests/e2e/data/countries/br.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/bs.json b/plugins/woocommerce/tests/e2e/data/countries/bs.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/bs.json
rename to plugins/woocommerce/tests/e2e/data/countries/bs.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/bt.json b/plugins/woocommerce/tests/e2e/data/countries/bt.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/bt.json
rename to plugins/woocommerce/tests/e2e/data/countries/bt.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/bv.json b/plugins/woocommerce/tests/e2e/data/countries/bv.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/bv.json
rename to plugins/woocommerce/tests/e2e/data/countries/bv.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/bw.json b/plugins/woocommerce/tests/e2e/data/countries/bw.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/bw.json
rename to plugins/woocommerce/tests/e2e/data/countries/bw.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/by.json b/plugins/woocommerce/tests/e2e/data/countries/by.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/by.json
rename to plugins/woocommerce/tests/e2e/data/countries/by.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/bz.json b/plugins/woocommerce/tests/e2e/data/countries/bz.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/bz.json
rename to plugins/woocommerce/tests/e2e/data/countries/bz.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ca.json b/plugins/woocommerce/tests/e2e/data/countries/ca.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ca.json
rename to plugins/woocommerce/tests/e2e/data/countries/ca.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/cc.json b/plugins/woocommerce/tests/e2e/data/countries/cc.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/cc.json
rename to plugins/woocommerce/tests/e2e/data/countries/cc.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/cd.json b/plugins/woocommerce/tests/e2e/data/countries/cd.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/cd.json
rename to plugins/woocommerce/tests/e2e/data/countries/cd.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/cf.json b/plugins/woocommerce/tests/e2e/data/countries/cf.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/cf.json
rename to plugins/woocommerce/tests/e2e/data/countries/cf.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/cg.json b/plugins/woocommerce/tests/e2e/data/countries/cg.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/cg.json
rename to plugins/woocommerce/tests/e2e/data/countries/cg.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ch.json b/plugins/woocommerce/tests/e2e/data/countries/ch.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ch.json
rename to plugins/woocommerce/tests/e2e/data/countries/ch.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ci.json b/plugins/woocommerce/tests/e2e/data/countries/ci.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ci.json
rename to plugins/woocommerce/tests/e2e/data/countries/ci.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ck.json b/plugins/woocommerce/tests/e2e/data/countries/ck.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ck.json
rename to plugins/woocommerce/tests/e2e/data/countries/ck.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/cl.json b/plugins/woocommerce/tests/e2e/data/countries/cl.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/cl.json
rename to plugins/woocommerce/tests/e2e/data/countries/cl.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/cm.json b/plugins/woocommerce/tests/e2e/data/countries/cm.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/cm.json
rename to plugins/woocommerce/tests/e2e/data/countries/cm.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/cn.json b/plugins/woocommerce/tests/e2e/data/countries/cn.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/cn.json
rename to plugins/woocommerce/tests/e2e/data/countries/cn.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/co.json b/plugins/woocommerce/tests/e2e/data/countries/co.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/co.json
rename to plugins/woocommerce/tests/e2e/data/countries/co.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/cr.json b/plugins/woocommerce/tests/e2e/data/countries/cr.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/cr.json
rename to plugins/woocommerce/tests/e2e/data/countries/cr.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/cu.json b/plugins/woocommerce/tests/e2e/data/countries/cu.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/cu.json
rename to plugins/woocommerce/tests/e2e/data/countries/cu.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/cv.json b/plugins/woocommerce/tests/e2e/data/countries/cv.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/cv.json
rename to plugins/woocommerce/tests/e2e/data/countries/cv.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/cw.json b/plugins/woocommerce/tests/e2e/data/countries/cw.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/cw.json
rename to plugins/woocommerce/tests/e2e/data/countries/cw.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/cx.json b/plugins/woocommerce/tests/e2e/data/countries/cx.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/cx.json
rename to plugins/woocommerce/tests/e2e/data/countries/cx.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/cy.json b/plugins/woocommerce/tests/e2e/data/countries/cy.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/cy.json
rename to plugins/woocommerce/tests/e2e/data/countries/cy.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/cz.json b/plugins/woocommerce/tests/e2e/data/countries/cz.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/cz.json
rename to plugins/woocommerce/tests/e2e/data/countries/cz.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/de.json b/plugins/woocommerce/tests/e2e/data/countries/de.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/de.json
rename to plugins/woocommerce/tests/e2e/data/countries/de.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/dj.json b/plugins/woocommerce/tests/e2e/data/countries/dj.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/dj.json
rename to plugins/woocommerce/tests/e2e/data/countries/dj.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/dk.json b/plugins/woocommerce/tests/e2e/data/countries/dk.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/dk.json
rename to plugins/woocommerce/tests/e2e/data/countries/dk.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/dm.json b/plugins/woocommerce/tests/e2e/data/countries/dm.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/dm.json
rename to plugins/woocommerce/tests/e2e/data/countries/dm.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/do.json b/plugins/woocommerce/tests/e2e/data/countries/do.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/do.json
rename to plugins/woocommerce/tests/e2e/data/countries/do.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/dz.json b/plugins/woocommerce/tests/e2e/data/countries/dz.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/dz.json
rename to plugins/woocommerce/tests/e2e/data/countries/dz.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ec.json b/plugins/woocommerce/tests/e2e/data/countries/ec.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ec.json
rename to plugins/woocommerce/tests/e2e/data/countries/ec.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ee.json b/plugins/woocommerce/tests/e2e/data/countries/ee.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ee.json
rename to plugins/woocommerce/tests/e2e/data/countries/ee.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/eg.json b/plugins/woocommerce/tests/e2e/data/countries/eg.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/eg.json
rename to plugins/woocommerce/tests/e2e/data/countries/eg.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/eh.json b/plugins/woocommerce/tests/e2e/data/countries/eh.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/eh.json
rename to plugins/woocommerce/tests/e2e/data/countries/eh.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/er.json b/plugins/woocommerce/tests/e2e/data/countries/er.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/er.json
rename to plugins/woocommerce/tests/e2e/data/countries/er.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/es.json b/plugins/woocommerce/tests/e2e/data/countries/es.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/es.json
rename to plugins/woocommerce/tests/e2e/data/countries/es.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/et.json b/plugins/woocommerce/tests/e2e/data/countries/et.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/et.json
rename to plugins/woocommerce/tests/e2e/data/countries/et.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/fi.json b/plugins/woocommerce/tests/e2e/data/countries/fi.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/fi.json
rename to plugins/woocommerce/tests/e2e/data/countries/fi.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/fj.json b/plugins/woocommerce/tests/e2e/data/countries/fj.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/fj.json
rename to plugins/woocommerce/tests/e2e/data/countries/fj.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/fk.json b/plugins/woocommerce/tests/e2e/data/countries/fk.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/fk.json
rename to plugins/woocommerce/tests/e2e/data/countries/fk.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/fm.json b/plugins/woocommerce/tests/e2e/data/countries/fm.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/fm.json
rename to plugins/woocommerce/tests/e2e/data/countries/fm.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/fo.json b/plugins/woocommerce/tests/e2e/data/countries/fo.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/fo.json
rename to plugins/woocommerce/tests/e2e/data/countries/fo.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/fr.json b/plugins/woocommerce/tests/e2e/data/countries/fr.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/fr.json
rename to plugins/woocommerce/tests/e2e/data/countries/fr.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ga.json b/plugins/woocommerce/tests/e2e/data/countries/ga.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ga.json
rename to plugins/woocommerce/tests/e2e/data/countries/ga.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/gb.json b/plugins/woocommerce/tests/e2e/data/countries/gb.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/gb.json
rename to plugins/woocommerce/tests/e2e/data/countries/gb.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/gd.json b/plugins/woocommerce/tests/e2e/data/countries/gd.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/gd.json
rename to plugins/woocommerce/tests/e2e/data/countries/gd.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ge.json b/plugins/woocommerce/tests/e2e/data/countries/ge.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ge.json
rename to plugins/woocommerce/tests/e2e/data/countries/ge.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/gf.json b/plugins/woocommerce/tests/e2e/data/countries/gf.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/gf.json
rename to plugins/woocommerce/tests/e2e/data/countries/gf.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/gg.json b/plugins/woocommerce/tests/e2e/data/countries/gg.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/gg.json
rename to plugins/woocommerce/tests/e2e/data/countries/gg.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/gh.json b/plugins/woocommerce/tests/e2e/data/countries/gh.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/gh.json
rename to plugins/woocommerce/tests/e2e/data/countries/gh.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/gi.json b/plugins/woocommerce/tests/e2e/data/countries/gi.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/gi.json
rename to plugins/woocommerce/tests/e2e/data/countries/gi.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/gl.json b/plugins/woocommerce/tests/e2e/data/countries/gl.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/gl.json
rename to plugins/woocommerce/tests/e2e/data/countries/gl.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/gm.json b/plugins/woocommerce/tests/e2e/data/countries/gm.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/gm.json
rename to plugins/woocommerce/tests/e2e/data/countries/gm.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/gn.json b/plugins/woocommerce/tests/e2e/data/countries/gn.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/gn.json
rename to plugins/woocommerce/tests/e2e/data/countries/gn.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/gp.json b/plugins/woocommerce/tests/e2e/data/countries/gp.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/gp.json
rename to plugins/woocommerce/tests/e2e/data/countries/gp.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/gq.json b/plugins/woocommerce/tests/e2e/data/countries/gq.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/gq.json
rename to plugins/woocommerce/tests/e2e/data/countries/gq.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/gr.json b/plugins/woocommerce/tests/e2e/data/countries/gr.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/gr.json
rename to plugins/woocommerce/tests/e2e/data/countries/gr.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/gs.json b/plugins/woocommerce/tests/e2e/data/countries/gs.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/gs.json
rename to plugins/woocommerce/tests/e2e/data/countries/gs.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/gt.json b/plugins/woocommerce/tests/e2e/data/countries/gt.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/gt.json
rename to plugins/woocommerce/tests/e2e/data/countries/gt.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/gu.json b/plugins/woocommerce/tests/e2e/data/countries/gu.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/gu.json
rename to plugins/woocommerce/tests/e2e/data/countries/gu.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/gw.json b/plugins/woocommerce/tests/e2e/data/countries/gw.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/gw.json
rename to plugins/woocommerce/tests/e2e/data/countries/gw.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/gy.json b/plugins/woocommerce/tests/e2e/data/countries/gy.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/gy.json
rename to plugins/woocommerce/tests/e2e/data/countries/gy.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/hk.json b/plugins/woocommerce/tests/e2e/data/countries/hk.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/hk.json
rename to plugins/woocommerce/tests/e2e/data/countries/hk.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/hm.json b/plugins/woocommerce/tests/e2e/data/countries/hm.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/hm.json
rename to plugins/woocommerce/tests/e2e/data/countries/hm.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/hn.json b/plugins/woocommerce/tests/e2e/data/countries/hn.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/hn.json
rename to plugins/woocommerce/tests/e2e/data/countries/hn.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/hr.json b/plugins/woocommerce/tests/e2e/data/countries/hr.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/hr.json
rename to plugins/woocommerce/tests/e2e/data/countries/hr.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ht.json b/plugins/woocommerce/tests/e2e/data/countries/ht.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ht.json
rename to plugins/woocommerce/tests/e2e/data/countries/ht.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/hu.json b/plugins/woocommerce/tests/e2e/data/countries/hu.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/hu.json
rename to plugins/woocommerce/tests/e2e/data/countries/hu.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/id.json b/plugins/woocommerce/tests/e2e/data/countries/id.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/id.json
rename to plugins/woocommerce/tests/e2e/data/countries/id.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ie.json b/plugins/woocommerce/tests/e2e/data/countries/ie.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ie.json
rename to plugins/woocommerce/tests/e2e/data/countries/ie.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/il.json b/plugins/woocommerce/tests/e2e/data/countries/il.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/il.json
rename to plugins/woocommerce/tests/e2e/data/countries/il.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/im.json b/plugins/woocommerce/tests/e2e/data/countries/im.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/im.json
rename to plugins/woocommerce/tests/e2e/data/countries/im.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/in.json b/plugins/woocommerce/tests/e2e/data/countries/in.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/in.json
rename to plugins/woocommerce/tests/e2e/data/countries/in.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/io.json b/plugins/woocommerce/tests/e2e/data/countries/io.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/io.json
rename to plugins/woocommerce/tests/e2e/data/countries/io.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/iq.json b/plugins/woocommerce/tests/e2e/data/countries/iq.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/iq.json
rename to plugins/woocommerce/tests/e2e/data/countries/iq.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ir.json b/plugins/woocommerce/tests/e2e/data/countries/ir.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ir.json
rename to plugins/woocommerce/tests/e2e/data/countries/ir.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/is.json b/plugins/woocommerce/tests/e2e/data/countries/is.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/is.json
rename to plugins/woocommerce/tests/e2e/data/countries/is.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/it.json b/plugins/woocommerce/tests/e2e/data/countries/it.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/it.json
rename to plugins/woocommerce/tests/e2e/data/countries/it.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/je.json b/plugins/woocommerce/tests/e2e/data/countries/je.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/je.json
rename to plugins/woocommerce/tests/e2e/data/countries/je.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/jm.json b/plugins/woocommerce/tests/e2e/data/countries/jm.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/jm.json
rename to plugins/woocommerce/tests/e2e/data/countries/jm.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/jo.json b/plugins/woocommerce/tests/e2e/data/countries/jo.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/jo.json
rename to plugins/woocommerce/tests/e2e/data/countries/jo.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/jp.json b/plugins/woocommerce/tests/e2e/data/countries/jp.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/jp.json
rename to plugins/woocommerce/tests/e2e/data/countries/jp.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ke.json b/plugins/woocommerce/tests/e2e/data/countries/ke.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ke.json
rename to plugins/woocommerce/tests/e2e/data/countries/ke.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/kg.json b/plugins/woocommerce/tests/e2e/data/countries/kg.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/kg.json
rename to plugins/woocommerce/tests/e2e/data/countries/kg.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/kh.json b/plugins/woocommerce/tests/e2e/data/countries/kh.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/kh.json
rename to plugins/woocommerce/tests/e2e/data/countries/kh.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ki.json b/plugins/woocommerce/tests/e2e/data/countries/ki.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ki.json
rename to plugins/woocommerce/tests/e2e/data/countries/ki.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/km.json b/plugins/woocommerce/tests/e2e/data/countries/km.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/km.json
rename to plugins/woocommerce/tests/e2e/data/countries/km.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/kn.json b/plugins/woocommerce/tests/e2e/data/countries/kn.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/kn.json
rename to plugins/woocommerce/tests/e2e/data/countries/kn.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/kp.json b/plugins/woocommerce/tests/e2e/data/countries/kp.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/kp.json
rename to plugins/woocommerce/tests/e2e/data/countries/kp.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/kr.json b/plugins/woocommerce/tests/e2e/data/countries/kr.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/kr.json
rename to plugins/woocommerce/tests/e2e/data/countries/kr.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/kw.json b/plugins/woocommerce/tests/e2e/data/countries/kw.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/kw.json
rename to plugins/woocommerce/tests/e2e/data/countries/kw.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ky.json b/plugins/woocommerce/tests/e2e/data/countries/ky.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ky.json
rename to plugins/woocommerce/tests/e2e/data/countries/ky.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/kz.json b/plugins/woocommerce/tests/e2e/data/countries/kz.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/kz.json
rename to plugins/woocommerce/tests/e2e/data/countries/kz.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/la.json b/plugins/woocommerce/tests/e2e/data/countries/la.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/la.json
rename to plugins/woocommerce/tests/e2e/data/countries/la.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/lb.json b/plugins/woocommerce/tests/e2e/data/countries/lb.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/lb.json
rename to plugins/woocommerce/tests/e2e/data/countries/lb.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/lc.json b/plugins/woocommerce/tests/e2e/data/countries/lc.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/lc.json
rename to plugins/woocommerce/tests/e2e/data/countries/lc.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/li.json b/plugins/woocommerce/tests/e2e/data/countries/li.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/li.json
rename to plugins/woocommerce/tests/e2e/data/countries/li.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/lk.json b/plugins/woocommerce/tests/e2e/data/countries/lk.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/lk.json
rename to plugins/woocommerce/tests/e2e/data/countries/lk.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/lr.json b/plugins/woocommerce/tests/e2e/data/countries/lr.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/lr.json
rename to plugins/woocommerce/tests/e2e/data/countries/lr.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ls.json b/plugins/woocommerce/tests/e2e/data/countries/ls.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ls.json
rename to plugins/woocommerce/tests/e2e/data/countries/ls.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/lt.json b/plugins/woocommerce/tests/e2e/data/countries/lt.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/lt.json
rename to plugins/woocommerce/tests/e2e/data/countries/lt.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/lu.json b/plugins/woocommerce/tests/e2e/data/countries/lu.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/lu.json
rename to plugins/woocommerce/tests/e2e/data/countries/lu.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/lv.json b/plugins/woocommerce/tests/e2e/data/countries/lv.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/lv.json
rename to plugins/woocommerce/tests/e2e/data/countries/lv.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ly.json b/plugins/woocommerce/tests/e2e/data/countries/ly.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ly.json
rename to plugins/woocommerce/tests/e2e/data/countries/ly.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ma.json b/plugins/woocommerce/tests/e2e/data/countries/ma.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ma.json
rename to plugins/woocommerce/tests/e2e/data/countries/ma.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/mc.json b/plugins/woocommerce/tests/e2e/data/countries/mc.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/mc.json
rename to plugins/woocommerce/tests/e2e/data/countries/mc.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/md.json b/plugins/woocommerce/tests/e2e/data/countries/md.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/md.json
rename to plugins/woocommerce/tests/e2e/data/countries/md.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/me.json b/plugins/woocommerce/tests/e2e/data/countries/me.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/me.json
rename to plugins/woocommerce/tests/e2e/data/countries/me.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/mf.json b/plugins/woocommerce/tests/e2e/data/countries/mf.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/mf.json
rename to plugins/woocommerce/tests/e2e/data/countries/mf.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/mg.json b/plugins/woocommerce/tests/e2e/data/countries/mg.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/mg.json
rename to plugins/woocommerce/tests/e2e/data/countries/mg.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/mh.json b/plugins/woocommerce/tests/e2e/data/countries/mh.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/mh.json
rename to plugins/woocommerce/tests/e2e/data/countries/mh.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/mk.json b/plugins/woocommerce/tests/e2e/data/countries/mk.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/mk.json
rename to plugins/woocommerce/tests/e2e/data/countries/mk.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ml.json b/plugins/woocommerce/tests/e2e/data/countries/ml.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ml.json
rename to plugins/woocommerce/tests/e2e/data/countries/ml.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/mm.json b/plugins/woocommerce/tests/e2e/data/countries/mm.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/mm.json
rename to plugins/woocommerce/tests/e2e/data/countries/mm.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/mn.json b/plugins/woocommerce/tests/e2e/data/countries/mn.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/mn.json
rename to plugins/woocommerce/tests/e2e/data/countries/mn.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/mo.json b/plugins/woocommerce/tests/e2e/data/countries/mo.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/mo.json
rename to plugins/woocommerce/tests/e2e/data/countries/mo.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/mp.json b/plugins/woocommerce/tests/e2e/data/countries/mp.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/mp.json
rename to plugins/woocommerce/tests/e2e/data/countries/mp.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/mq.json b/plugins/woocommerce/tests/e2e/data/countries/mq.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/mq.json
rename to plugins/woocommerce/tests/e2e/data/countries/mq.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/mr.json b/plugins/woocommerce/tests/e2e/data/countries/mr.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/mr.json
rename to plugins/woocommerce/tests/e2e/data/countries/mr.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ms.json b/plugins/woocommerce/tests/e2e/data/countries/ms.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ms.json
rename to plugins/woocommerce/tests/e2e/data/countries/ms.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/mt.json b/plugins/woocommerce/tests/e2e/data/countries/mt.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/mt.json
rename to plugins/woocommerce/tests/e2e/data/countries/mt.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/mu.json b/plugins/woocommerce/tests/e2e/data/countries/mu.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/mu.json
rename to plugins/woocommerce/tests/e2e/data/countries/mu.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/mv.json b/plugins/woocommerce/tests/e2e/data/countries/mv.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/mv.json
rename to plugins/woocommerce/tests/e2e/data/countries/mv.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/mw.json b/plugins/woocommerce/tests/e2e/data/countries/mw.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/mw.json
rename to plugins/woocommerce/tests/e2e/data/countries/mw.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/mx.json b/plugins/woocommerce/tests/e2e/data/countries/mx.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/mx.json
rename to plugins/woocommerce/tests/e2e/data/countries/mx.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/my.json b/plugins/woocommerce/tests/e2e/data/countries/my.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/my.json
rename to plugins/woocommerce/tests/e2e/data/countries/my.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/mz.json b/plugins/woocommerce/tests/e2e/data/countries/mz.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/mz.json
rename to plugins/woocommerce/tests/e2e/data/countries/mz.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/na.json b/plugins/woocommerce/tests/e2e/data/countries/na.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/na.json
rename to plugins/woocommerce/tests/e2e/data/countries/na.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/nc.json b/plugins/woocommerce/tests/e2e/data/countries/nc.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/nc.json
rename to plugins/woocommerce/tests/e2e/data/countries/nc.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ne.json b/plugins/woocommerce/tests/e2e/data/countries/ne.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ne.json
rename to plugins/woocommerce/tests/e2e/data/countries/ne.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/nf.json b/plugins/woocommerce/tests/e2e/data/countries/nf.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/nf.json
rename to plugins/woocommerce/tests/e2e/data/countries/nf.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ng.json b/plugins/woocommerce/tests/e2e/data/countries/ng.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ng.json
rename to plugins/woocommerce/tests/e2e/data/countries/ng.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ni.json b/plugins/woocommerce/tests/e2e/data/countries/ni.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ni.json
rename to plugins/woocommerce/tests/e2e/data/countries/ni.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/nl.json b/plugins/woocommerce/tests/e2e/data/countries/nl.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/nl.json
rename to plugins/woocommerce/tests/e2e/data/countries/nl.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/no.json b/plugins/woocommerce/tests/e2e/data/countries/no.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/no.json
rename to plugins/woocommerce/tests/e2e/data/countries/no.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/np.json b/plugins/woocommerce/tests/e2e/data/countries/np.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/np.json
rename to plugins/woocommerce/tests/e2e/data/countries/np.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/nr.json b/plugins/woocommerce/tests/e2e/data/countries/nr.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/nr.json
rename to plugins/woocommerce/tests/e2e/data/countries/nr.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/nu.json b/plugins/woocommerce/tests/e2e/data/countries/nu.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/nu.json
rename to plugins/woocommerce/tests/e2e/data/countries/nu.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/nz.json b/plugins/woocommerce/tests/e2e/data/countries/nz.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/nz.json
rename to plugins/woocommerce/tests/e2e/data/countries/nz.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/om.json b/plugins/woocommerce/tests/e2e/data/countries/om.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/om.json
rename to plugins/woocommerce/tests/e2e/data/countries/om.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/pa.json b/plugins/woocommerce/tests/e2e/data/countries/pa.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/pa.json
rename to plugins/woocommerce/tests/e2e/data/countries/pa.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/pe.json b/plugins/woocommerce/tests/e2e/data/countries/pe.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/pe.json
rename to plugins/woocommerce/tests/e2e/data/countries/pe.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/pf.json b/plugins/woocommerce/tests/e2e/data/countries/pf.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/pf.json
rename to plugins/woocommerce/tests/e2e/data/countries/pf.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/pg.json b/plugins/woocommerce/tests/e2e/data/countries/pg.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/pg.json
rename to plugins/woocommerce/tests/e2e/data/countries/pg.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ph.json b/plugins/woocommerce/tests/e2e/data/countries/ph.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ph.json
rename to plugins/woocommerce/tests/e2e/data/countries/ph.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/pk.json b/plugins/woocommerce/tests/e2e/data/countries/pk.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/pk.json
rename to plugins/woocommerce/tests/e2e/data/countries/pk.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/pl.json b/plugins/woocommerce/tests/e2e/data/countries/pl.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/pl.json
rename to plugins/woocommerce/tests/e2e/data/countries/pl.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/pm.json b/plugins/woocommerce/tests/e2e/data/countries/pm.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/pm.json
rename to plugins/woocommerce/tests/e2e/data/countries/pm.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/pn.json b/plugins/woocommerce/tests/e2e/data/countries/pn.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/pn.json
rename to plugins/woocommerce/tests/e2e/data/countries/pn.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/pr.json b/plugins/woocommerce/tests/e2e/data/countries/pr.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/pr.json
rename to plugins/woocommerce/tests/e2e/data/countries/pr.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ps.json b/plugins/woocommerce/tests/e2e/data/countries/ps.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ps.json
rename to plugins/woocommerce/tests/e2e/data/countries/ps.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/pt.json b/plugins/woocommerce/tests/e2e/data/countries/pt.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/pt.json
rename to plugins/woocommerce/tests/e2e/data/countries/pt.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/pw.json b/plugins/woocommerce/tests/e2e/data/countries/pw.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/pw.json
rename to plugins/woocommerce/tests/e2e/data/countries/pw.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/py.json b/plugins/woocommerce/tests/e2e/data/countries/py.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/py.json
rename to plugins/woocommerce/tests/e2e/data/countries/py.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/qa.json b/plugins/woocommerce/tests/e2e/data/countries/qa.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/qa.json
rename to plugins/woocommerce/tests/e2e/data/countries/qa.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/re.json b/plugins/woocommerce/tests/e2e/data/countries/re.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/re.json
rename to plugins/woocommerce/tests/e2e/data/countries/re.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ro.json b/plugins/woocommerce/tests/e2e/data/countries/ro.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ro.json
rename to plugins/woocommerce/tests/e2e/data/countries/ro.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/rs.json b/plugins/woocommerce/tests/e2e/data/countries/rs.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/rs.json
rename to plugins/woocommerce/tests/e2e/data/countries/rs.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ru.json b/plugins/woocommerce/tests/e2e/data/countries/ru.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ru.json
rename to plugins/woocommerce/tests/e2e/data/countries/ru.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/rw.json b/plugins/woocommerce/tests/e2e/data/countries/rw.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/rw.json
rename to plugins/woocommerce/tests/e2e/data/countries/rw.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/sa.json b/plugins/woocommerce/tests/e2e/data/countries/sa.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/sa.json
rename to plugins/woocommerce/tests/e2e/data/countries/sa.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/sb.json b/plugins/woocommerce/tests/e2e/data/countries/sb.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/sb.json
rename to plugins/woocommerce/tests/e2e/data/countries/sb.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/sc.json b/plugins/woocommerce/tests/e2e/data/countries/sc.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/sc.json
rename to plugins/woocommerce/tests/e2e/data/countries/sc.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/sd.json b/plugins/woocommerce/tests/e2e/data/countries/sd.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/sd.json
rename to plugins/woocommerce/tests/e2e/data/countries/sd.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/se.json b/plugins/woocommerce/tests/e2e/data/countries/se.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/se.json
rename to plugins/woocommerce/tests/e2e/data/countries/se.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/sg.json b/plugins/woocommerce/tests/e2e/data/countries/sg.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/sg.json
rename to plugins/woocommerce/tests/e2e/data/countries/sg.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/sh.json b/plugins/woocommerce/tests/e2e/data/countries/sh.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/sh.json
rename to plugins/woocommerce/tests/e2e/data/countries/sh.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/si.json b/plugins/woocommerce/tests/e2e/data/countries/si.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/si.json
rename to plugins/woocommerce/tests/e2e/data/countries/si.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/sj.json b/plugins/woocommerce/tests/e2e/data/countries/sj.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/sj.json
rename to plugins/woocommerce/tests/e2e/data/countries/sj.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/sk.json b/plugins/woocommerce/tests/e2e/data/countries/sk.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/sk.json
rename to plugins/woocommerce/tests/e2e/data/countries/sk.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/sl.json b/plugins/woocommerce/tests/e2e/data/countries/sl.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/sl.json
rename to plugins/woocommerce/tests/e2e/data/countries/sl.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/sm.json b/plugins/woocommerce/tests/e2e/data/countries/sm.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/sm.json
rename to plugins/woocommerce/tests/e2e/data/countries/sm.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/sn.json b/plugins/woocommerce/tests/e2e/data/countries/sn.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/sn.json
rename to plugins/woocommerce/tests/e2e/data/countries/sn.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/so.json b/plugins/woocommerce/tests/e2e/data/countries/so.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/so.json
rename to plugins/woocommerce/tests/e2e/data/countries/so.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/sr.json b/plugins/woocommerce/tests/e2e/data/countries/sr.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/sr.json
rename to plugins/woocommerce/tests/e2e/data/countries/sr.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ss.json b/plugins/woocommerce/tests/e2e/data/countries/ss.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ss.json
rename to plugins/woocommerce/tests/e2e/data/countries/ss.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/st.json b/plugins/woocommerce/tests/e2e/data/countries/st.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/st.json
rename to plugins/woocommerce/tests/e2e/data/countries/st.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/sv.json b/plugins/woocommerce/tests/e2e/data/countries/sv.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/sv.json
rename to plugins/woocommerce/tests/e2e/data/countries/sv.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/sx.json b/plugins/woocommerce/tests/e2e/data/countries/sx.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/sx.json
rename to plugins/woocommerce/tests/e2e/data/countries/sx.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/sy.json b/plugins/woocommerce/tests/e2e/data/countries/sy.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/sy.json
rename to plugins/woocommerce/tests/e2e/data/countries/sy.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/sz.json b/plugins/woocommerce/tests/e2e/data/countries/sz.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/sz.json
rename to plugins/woocommerce/tests/e2e/data/countries/sz.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/tc.json b/plugins/woocommerce/tests/e2e/data/countries/tc.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/tc.json
rename to plugins/woocommerce/tests/e2e/data/countries/tc.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/td.json b/plugins/woocommerce/tests/e2e/data/countries/td.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/td.json
rename to plugins/woocommerce/tests/e2e/data/countries/td.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/tf.json b/plugins/woocommerce/tests/e2e/data/countries/tf.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/tf.json
rename to plugins/woocommerce/tests/e2e/data/countries/tf.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/tg.json b/plugins/woocommerce/tests/e2e/data/countries/tg.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/tg.json
rename to plugins/woocommerce/tests/e2e/data/countries/tg.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/th.json b/plugins/woocommerce/tests/e2e/data/countries/th.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/th.json
rename to plugins/woocommerce/tests/e2e/data/countries/th.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/tj.json b/plugins/woocommerce/tests/e2e/data/countries/tj.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/tj.json
rename to plugins/woocommerce/tests/e2e/data/countries/tj.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/tk.json b/plugins/woocommerce/tests/e2e/data/countries/tk.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/tk.json
rename to plugins/woocommerce/tests/e2e/data/countries/tk.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/tl.json b/plugins/woocommerce/tests/e2e/data/countries/tl.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/tl.json
rename to plugins/woocommerce/tests/e2e/data/countries/tl.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/tm.json b/plugins/woocommerce/tests/e2e/data/countries/tm.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/tm.json
rename to plugins/woocommerce/tests/e2e/data/countries/tm.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/tn.json b/plugins/woocommerce/tests/e2e/data/countries/tn.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/tn.json
rename to plugins/woocommerce/tests/e2e/data/countries/tn.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/to.json b/plugins/woocommerce/tests/e2e/data/countries/to.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/to.json
rename to plugins/woocommerce/tests/e2e/data/countries/to.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/tr.json b/plugins/woocommerce/tests/e2e/data/countries/tr.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/tr.json
rename to plugins/woocommerce/tests/e2e/data/countries/tr.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/tt.json b/plugins/woocommerce/tests/e2e/data/countries/tt.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/tt.json
rename to plugins/woocommerce/tests/e2e/data/countries/tt.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/tv.json b/plugins/woocommerce/tests/e2e/data/countries/tv.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/tv.json
rename to plugins/woocommerce/tests/e2e/data/countries/tv.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/tw.json b/plugins/woocommerce/tests/e2e/data/countries/tw.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/tw.json
rename to plugins/woocommerce/tests/e2e/data/countries/tw.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/tz.json b/plugins/woocommerce/tests/e2e/data/countries/tz.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/tz.json
rename to plugins/woocommerce/tests/e2e/data/countries/tz.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ua.json b/plugins/woocommerce/tests/e2e/data/countries/ua.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ua.json
rename to plugins/woocommerce/tests/e2e/data/countries/ua.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ug.json b/plugins/woocommerce/tests/e2e/data/countries/ug.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ug.json
rename to plugins/woocommerce/tests/e2e/data/countries/ug.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/um.json b/plugins/woocommerce/tests/e2e/data/countries/um.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/um.json
rename to plugins/woocommerce/tests/e2e/data/countries/um.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/us.json b/plugins/woocommerce/tests/e2e/data/countries/us.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/us.json
rename to plugins/woocommerce/tests/e2e/data/countries/us.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/uy.json b/plugins/woocommerce/tests/e2e/data/countries/uy.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/uy.json
rename to plugins/woocommerce/tests/e2e/data/countries/uy.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/uz.json b/plugins/woocommerce/tests/e2e/data/countries/uz.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/uz.json
rename to plugins/woocommerce/tests/e2e/data/countries/uz.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/va.json b/plugins/woocommerce/tests/e2e/data/countries/va.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/va.json
rename to plugins/woocommerce/tests/e2e/data/countries/va.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/vc.json b/plugins/woocommerce/tests/e2e/data/countries/vc.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/vc.json
rename to plugins/woocommerce/tests/e2e/data/countries/vc.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ve.json b/plugins/woocommerce/tests/e2e/data/countries/ve.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ve.json
rename to plugins/woocommerce/tests/e2e/data/countries/ve.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/vg.json b/plugins/woocommerce/tests/e2e/data/countries/vg.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/vg.json
rename to plugins/woocommerce/tests/e2e/data/countries/vg.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/vi.json b/plugins/woocommerce/tests/e2e/data/countries/vi.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/vi.json
rename to plugins/woocommerce/tests/e2e/data/countries/vi.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/vn.json b/plugins/woocommerce/tests/e2e/data/countries/vn.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/vn.json
rename to plugins/woocommerce/tests/e2e/data/countries/vn.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/vu.json b/plugins/woocommerce/tests/e2e/data/countries/vu.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/vu.json
rename to plugins/woocommerce/tests/e2e/data/countries/vu.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/wf.json b/plugins/woocommerce/tests/e2e/data/countries/wf.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/wf.json
rename to plugins/woocommerce/tests/e2e/data/countries/wf.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ws.json b/plugins/woocommerce/tests/e2e/data/countries/ws.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ws.json
rename to plugins/woocommerce/tests/e2e/data/countries/ws.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/xk.json b/plugins/woocommerce/tests/e2e/data/countries/xk.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/xk.json
rename to plugins/woocommerce/tests/e2e/data/countries/xk.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/ye.json b/plugins/woocommerce/tests/e2e/data/countries/ye.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/ye.json
rename to plugins/woocommerce/tests/e2e/data/countries/ye.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/yt.json b/plugins/woocommerce/tests/e2e/data/countries/yt.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/yt.json
rename to plugins/woocommerce/tests/e2e/data/countries/yt.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/za.json b/plugins/woocommerce/tests/e2e/data/countries/za.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/za.json
rename to plugins/woocommerce/tests/e2e/data/countries/za.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/zm.json b/plugins/woocommerce/tests/e2e/data/countries/zm.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/zm.json
rename to plugins/woocommerce/tests/e2e/data/countries/zm.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/countries/zw.json b/plugins/woocommerce/tests/e2e/data/countries/zw.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/countries/zw.json
rename to plugins/woocommerce/tests/e2e/data/countries/zw.json
diff --git a/plugins/woocommerce/tests/e2e-pw/data/coupon.ts b/plugins/woocommerce/tests/e2e/data/coupon.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/coupon.ts
rename to plugins/woocommerce/tests/e2e/data/coupon.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/data/index.ts b/plugins/woocommerce/tests/e2e/data/index.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/index.ts
rename to plugins/woocommerce/tests/e2e/data/index.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/data/order.ts b/plugins/woocommerce/tests/e2e/data/order.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/order.ts
rename to plugins/woocommerce/tests/e2e/data/order.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/data/products-crud.ts b/plugins/woocommerce/tests/e2e/data/products-crud.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/products-crud.ts
rename to plugins/woocommerce/tests/e2e/data/products-crud.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/data/refund.ts b/plugins/woocommerce/tests/e2e/data/refund.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/refund.ts
rename to plugins/woocommerce/tests/e2e/data/refund.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/data/settings.ts b/plugins/woocommerce/tests/e2e/data/settings.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/settings.ts
rename to plugins/woocommerce/tests/e2e/data/settings.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/data/shared/batch-update.ts b/plugins/woocommerce/tests/e2e/data/shared/batch-update.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/shared/batch-update.ts
rename to plugins/woocommerce/tests/e2e/data/shared/batch-update.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/data/shared/customer.ts b/plugins/woocommerce/tests/e2e/data/shared/customer.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/shared/customer.ts
rename to plugins/woocommerce/tests/e2e/data/shared/customer.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/data/shared/error-response.ts b/plugins/woocommerce/tests/e2e/data/shared/error-response.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/shared/error-response.ts
rename to plugins/woocommerce/tests/e2e/data/shared/error-response.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/data/shared/index.ts b/plugins/woocommerce/tests/e2e/data/shared/index.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/shared/index.ts
rename to plugins/woocommerce/tests/e2e/data/shared/index.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/data/shipping-method.ts b/plugins/woocommerce/tests/e2e/data/shipping-method.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/shipping-method.ts
rename to plugins/woocommerce/tests/e2e/data/shipping-method.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/data/shipping-zone.ts b/plugins/woocommerce/tests/e2e/data/shipping-zone.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/shipping-zone.ts
rename to plugins/woocommerce/tests/e2e/data/shipping-zone.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/data/tax-rate.ts b/plugins/woocommerce/tests/e2e/data/tax-rate.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/tax-rate.ts
rename to plugins/woocommerce/tests/e2e/data/tax-rate.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/data/variation.ts b/plugins/woocommerce/tests/e2e/data/variation.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/data/variation.ts
rename to plugins/woocommerce/tests/e2e/data/variation.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/envs/default-hpos-disabled/env-setup.sh b/plugins/woocommerce/tests/e2e/envs/default-hpos-disabled/env-setup.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/envs/default-hpos-disabled/env-setup.sh
rename to plugins/woocommerce/tests/e2e/envs/default-hpos-disabled/env-setup.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/envs/default-hpos-disabled/playwright.config.ts b/plugins/woocommerce/tests/e2e/envs/default-hpos-disabled/playwright.config.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/envs/default-hpos-disabled/playwright.config.ts
rename to plugins/woocommerce/tests/e2e/envs/default-hpos-disabled/playwright.config.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/envs/default-object-cache/env-setup.sh b/plugins/woocommerce/tests/e2e/envs/default-object-cache/env-setup.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/envs/default-object-cache/env-setup.sh
rename to plugins/woocommerce/tests/e2e/envs/default-object-cache/env-setup.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/envs/default-object-cache/playwright.config.ts b/plugins/woocommerce/tests/e2e/envs/default-object-cache/playwright.config.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/envs/default-object-cache/playwright.config.ts
rename to plugins/woocommerce/tests/e2e/envs/default-object-cache/playwright.config.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/envs/default-pressable/.env.enc b/plugins/woocommerce/tests/e2e/envs/default-pressable/.env.enc
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/envs/default-pressable/.env.enc
rename to plugins/woocommerce/tests/e2e/envs/default-pressable/.env.enc
diff --git a/plugins/woocommerce/tests/e2e-pw/envs/default-pressable/env-setup.sh b/plugins/woocommerce/tests/e2e/envs/default-pressable/env-setup.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/envs/default-pressable/env-setup.sh
rename to plugins/woocommerce/tests/e2e/envs/default-pressable/env-setup.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/envs/default-pressable/playwright.config.ts b/plugins/woocommerce/tests/e2e/envs/default-pressable/playwright.config.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/envs/default-pressable/playwright.config.ts
rename to plugins/woocommerce/tests/e2e/envs/default-pressable/playwright.config.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/envs/default-wpcom/.env.enc b/plugins/woocommerce/tests/e2e/envs/default-wpcom/.env.enc
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/envs/default-wpcom/.env.enc
rename to plugins/woocommerce/tests/e2e/envs/default-wpcom/.env.enc
diff --git a/plugins/woocommerce/tests/e2e-pw/envs/default-wpcom/env-setup.sh b/plugins/woocommerce/tests/e2e/envs/default-wpcom/env-setup.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/envs/default-wpcom/env-setup.sh
rename to plugins/woocommerce/tests/e2e/envs/default-wpcom/env-setup.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/envs/default-wpcom/playwright.config.ts b/plugins/woocommerce/tests/e2e/envs/default-wpcom/playwright.config.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/envs/default-wpcom/playwright.config.ts
rename to plugins/woocommerce/tests/e2e/envs/default-wpcom/playwright.config.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/envs/default/env-setup.sh b/plugins/woocommerce/tests/e2e/envs/default/env-setup.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/envs/default/env-setup.sh
rename to plugins/woocommerce/tests/e2e/envs/default/env-setup.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/envs/default/playwright.config.ts b/plugins/woocommerce/tests/e2e/envs/default/playwright.config.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/envs/default/playwright.config.ts
rename to plugins/woocommerce/tests/e2e/envs/default/playwright.config.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/envs/gutenberg-nightly/env-setup.sh b/plugins/woocommerce/tests/e2e/envs/gutenberg-nightly/env-setup.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/envs/gutenberg-nightly/env-setup.sh
rename to plugins/woocommerce/tests/e2e/envs/gutenberg-nightly/env-setup.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/envs/gutenberg-nightly/playwright.config.ts b/plugins/woocommerce/tests/e2e/envs/gutenberg-nightly/playwright.config.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/envs/gutenberg-nightly/playwright.config.ts
rename to plugins/woocommerce/tests/e2e/envs/gutenberg-nightly/playwright.config.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/envs/gutenberg-stable/env-setup.sh b/plugins/woocommerce/tests/e2e/envs/gutenberg-stable/env-setup.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/envs/gutenberg-stable/env-setup.sh
rename to plugins/woocommerce/tests/e2e/envs/gutenberg-stable/env-setup.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/envs/gutenberg-stable/playwright.config.ts b/plugins/woocommerce/tests/e2e/envs/gutenberg-stable/playwright.config.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/envs/gutenberg-stable/playwright.config.ts
rename to plugins/woocommerce/tests/e2e/envs/gutenberg-stable/playwright.config.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/envs/woocommerce-payments/env-setup.sh b/plugins/woocommerce/tests/e2e/envs/woocommerce-payments/env-setup.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/envs/woocommerce-payments/env-setup.sh
rename to plugins/woocommerce/tests/e2e/envs/woocommerce-payments/env-setup.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/envs/woocommerce-payments/playwright.config.ts b/plugins/woocommerce/tests/e2e/envs/woocommerce-payments/playwright.config.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/envs/woocommerce-payments/playwright.config.ts
rename to plugins/woocommerce/tests/e2e/envs/woocommerce-payments/playwright.config.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/envs/woocommerce-paypal-payments/env-setup.sh b/plugins/woocommerce/tests/e2e/envs/woocommerce-paypal-payments/env-setup.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/envs/woocommerce-paypal-payments/env-setup.sh
rename to plugins/woocommerce/tests/e2e/envs/woocommerce-paypal-payments/env-setup.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/envs/woocommerce-paypal-payments/playwright.config.ts b/plugins/woocommerce/tests/e2e/envs/woocommerce-paypal-payments/playwright.config.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/envs/woocommerce-paypal-payments/playwright.config.ts
rename to plugins/woocommerce/tests/e2e/envs/woocommerce-paypal-payments/playwright.config.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/envs/woocommerce-services/env-setup.sh b/plugins/woocommerce/tests/e2e/envs/woocommerce-services/env-setup.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/envs/woocommerce-services/env-setup.sh
rename to plugins/woocommerce/tests/e2e/envs/woocommerce-services/env-setup.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/envs/woocommerce-services/playwright.config.ts b/plugins/woocommerce/tests/e2e/envs/woocommerce-services/playwright.config.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/envs/woocommerce-services/playwright.config.ts
rename to plugins/woocommerce/tests/e2e/envs/woocommerce-services/playwright.config.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/fixtures/api-tests-fixtures.ts b/plugins/woocommerce/tests/e2e/fixtures/api-tests-fixtures.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/fixtures/api-tests-fixtures.ts
rename to plugins/woocommerce/tests/e2e/fixtures/api-tests-fixtures.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/fixtures/auth.setup.ts b/plugins/woocommerce/tests/e2e/fixtures/auth.setup.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/fixtures/auth.setup.ts
rename to plugins/woocommerce/tests/e2e/fixtures/auth.setup.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/fixtures/blocks-setup.ts b/plugins/woocommerce/tests/e2e/fixtures/blocks-setup.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/fixtures/blocks-setup.ts
rename to plugins/woocommerce/tests/e2e/fixtures/blocks-setup.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/fixtures/fixtures.ts b/plugins/woocommerce/tests/e2e/fixtures/fixtures.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/fixtures/fixtures.ts
rename to plugins/woocommerce/tests/e2e/fixtures/fixtures.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/fixtures/install-wc.setup.ts b/plugins/woocommerce/tests/e2e/fixtures/install-wc.setup.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/fixtures/install-wc.setup.ts
rename to plugins/woocommerce/tests/e2e/fixtures/install-wc.setup.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/fixtures/paypal-fixtures.ts b/plugins/woocommerce/tests/e2e/fixtures/paypal-fixtures.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/fixtures/paypal-fixtures.ts
rename to plugins/woocommerce/tests/e2e/fixtures/paypal-fixtures.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/fixtures/reset.setup.ts b/plugins/woocommerce/tests/e2e/fixtures/reset.setup.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/fixtures/reset.setup.ts
rename to plugins/woocommerce/tests/e2e/fixtures/reset.setup.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/fixtures/site.setup.ts b/plugins/woocommerce/tests/e2e/fixtures/site.setup.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/fixtures/site.setup.ts
rename to plugins/woocommerce/tests/e2e/fixtures/site.setup.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/playwright.config.ts b/plugins/woocommerce/tests/e2e/playwright.config.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/playwright.config.ts
rename to plugins/woocommerce/tests/e2e/playwright.config.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/playwright.performance.config.ts b/plugins/woocommerce/tests/e2e/playwright.performance.config.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/playwright.performance.config.ts
rename to plugins/woocommerce/tests/e2e/playwright.performance.config.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/reporters/environment-reporter.ts b/plugins/woocommerce/tests/e2e/reporters/environment-reporter.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/reporters/environment-reporter.ts
rename to plugins/woocommerce/tests/e2e/reporters/environment-reporter.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/reporters/skipped-tests.ts b/plugins/woocommerce/tests/e2e/reporters/skipped-tests.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/reporters/skipped-tests.ts
rename to plugins/woocommerce/tests/e2e/reporters/skipped-tests.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/rules/blocks/no-raw-playwright-test-import.js b/plugins/woocommerce/tests/e2e/rules/blocks/no-raw-playwright-test-import.js
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/rules/blocks/no-raw-playwright-test-import.js
rename to plugins/woocommerce/tests/e2e/rules/blocks/no-raw-playwright-test-import.js
diff --git a/plugins/woocommerce/tests/e2e-pw/run-tests-with-env.sh b/plugins/woocommerce/tests/e2e/run-tests-with-env.sh
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/run-tests-with-env.sh
rename to plugins/woocommerce/tests/e2e/run-tests-with-env.sh
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/blocks/data/data.ts b/plugins/woocommerce/tests/e2e/test-data/blocks/data/data.ts
similarity index 97%
rename from plugins/woocommerce/tests/e2e-pw/test-data/blocks/data/data.ts
rename to plugins/woocommerce/tests/e2e/test-data/blocks/data/data.ts
index a0731f8f2e9..88eb100d53c 100644
--- a/plugins/woocommerce/tests/e2e-pw/test-data/blocks/data/data.ts
+++ b/plugins/woocommerce/tests/e2e/test-data/blocks/data/data.ts
@@ -59,7 +59,7 @@ const customer = {
};
// Reviews are ordered by when they were created.
-// source: plugins/woocommerce/tests/e2e-pw/bin/blocks/scripts/parallel/reviews.sh
+// source: plugins/woocommerce/tests/e2e/bin/blocks/scripts/parallel/reviews.sh
const hoodieReviews = [
{
name: `${ customer.first_name } ${ customer.last_name }`,
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/data.ts b/plugins/woocommerce/tests/e2e/test-data/data.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/data.ts
rename to plugins/woocommerce/tests/e2e/test-data/data.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/album-1.jpg b/plugins/woocommerce/tests/e2e/test-data/images/album-1.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/album-1.jpg
rename to plugins/woocommerce/tests/e2e/test-data/images/album-1.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/album.jpg b/plugins/woocommerce/tests/e2e/test-data/images/album.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/album.jpg
rename to plugins/woocommerce/tests/e2e/test-data/images/album.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/beanie-2.jpg b/plugins/woocommerce/tests/e2e/test-data/images/beanie-2.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/beanie-2.jpg
rename to plugins/woocommerce/tests/e2e/test-data/images/beanie-2.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/beanie-with-logo-1.jpg b/plugins/woocommerce/tests/e2e/test-data/images/beanie-with-logo-1.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/beanie-with-logo-1.jpg
rename to plugins/woocommerce/tests/e2e/test-data/images/beanie-with-logo-1.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/belt-2.jpg b/plugins/woocommerce/tests/e2e/test-data/images/belt-2.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/belt-2.jpg
rename to plugins/woocommerce/tests/e2e/test-data/images/belt-2.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/cap-2.jpg b/plugins/woocommerce/tests/e2e/test-data/images/cap-2.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/cap-2.jpg
rename to plugins/woocommerce/tests/e2e/test-data/images/cap-2.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/hoodie-2.jpg b/plugins/woocommerce/tests/e2e/test-data/images/hoodie-2.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/hoodie-2.jpg
rename to plugins/woocommerce/tests/e2e/test-data/images/hoodie-2.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/hoodie-blue-1.jpg b/plugins/woocommerce/tests/e2e/test-data/images/hoodie-blue-1.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/hoodie-blue-1.jpg
rename to plugins/woocommerce/tests/e2e/test-data/images/hoodie-blue-1.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/hoodie-green-1.jpg b/plugins/woocommerce/tests/e2e/test-data/images/hoodie-green-1.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/hoodie-green-1.jpg
rename to plugins/woocommerce/tests/e2e/test-data/images/hoodie-green-1.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/hoodie-with-logo-2.jpg b/plugins/woocommerce/tests/e2e/test-data/images/hoodie-with-logo-2.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/hoodie-with-logo-2.jpg
rename to plugins/woocommerce/tests/e2e/test-data/images/hoodie-with-logo-2.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/hoodie-with-pocket-2.jpg b/plugins/woocommerce/tests/e2e/test-data/images/hoodie-with-pocket-2.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/hoodie-with-pocket-2.jpg
rename to plugins/woocommerce/tests/e2e/test-data/images/hoodie-with-pocket-2.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/hoodie-with-zipper-2.jpg b/plugins/woocommerce/tests/e2e/test-data/images/hoodie-with-zipper-2.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/hoodie-with-zipper-2.jpg
rename to plugins/woocommerce/tests/e2e/test-data/images/hoodie-with-zipper-2.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/image-01.png b/plugins/woocommerce/tests/e2e/test-data/images/image-01.png
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/image-01.png
rename to plugins/woocommerce/tests/e2e/test-data/images/image-01.png
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/image-02.png b/plugins/woocommerce/tests/e2e/test-data/images/image-02.png
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/image-02.png
rename to plugins/woocommerce/tests/e2e/test-data/images/image-02.png
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/image-03.png b/plugins/woocommerce/tests/e2e/test-data/images/image-03.png
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/image-03.png
rename to plugins/woocommerce/tests/e2e/test-data/images/image-03.png
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/logo-1.jpg b/plugins/woocommerce/tests/e2e/test-data/images/logo-1.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/logo-1.jpg
rename to plugins/woocommerce/tests/e2e/test-data/images/logo-1.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/long-sleeve-tee-2.jpg b/plugins/woocommerce/tests/e2e/test-data/images/long-sleeve-tee-2.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/long-sleeve-tee-2.jpg
rename to plugins/woocommerce/tests/e2e/test-data/images/long-sleeve-tee-2.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/pennant-1.jpg b/plugins/woocommerce/tests/e2e/test-data/images/pennant-1.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/pennant-1.jpg
rename to plugins/woocommerce/tests/e2e/test-data/images/pennant-1.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/polo-2.jpg b/plugins/woocommerce/tests/e2e/test-data/images/polo-2.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/polo-2.jpg
rename to plugins/woocommerce/tests/e2e/test-data/images/polo-2.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/single-1.jpg b/plugins/woocommerce/tests/e2e/test-data/images/single-1.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/single-1.jpg
rename to plugins/woocommerce/tests/e2e/test-data/images/single-1.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/single.jpg b/plugins/woocommerce/tests/e2e/test-data/images/single.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/single.jpg
rename to plugins/woocommerce/tests/e2e/test-data/images/single.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/sunglasses-2.jpg b/plugins/woocommerce/tests/e2e/test-data/images/sunglasses-2.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/sunglasses-2.jpg
rename to plugins/woocommerce/tests/e2e/test-data/images/sunglasses-2.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/t-shirt-with-logo-1.jpg b/plugins/woocommerce/tests/e2e/test-data/images/t-shirt-with-logo-1.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/t-shirt-with-logo-1.jpg
rename to plugins/woocommerce/tests/e2e/test-data/images/t-shirt-with-logo-1.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/tshirt-2.jpg b/plugins/woocommerce/tests/e2e/test-data/images/tshirt-2.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/tshirt-2.jpg
rename to plugins/woocommerce/tests/e2e/test-data/images/tshirt-2.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/vnech-tee-blue-1.jpg b/plugins/woocommerce/tests/e2e/test-data/images/vnech-tee-blue-1.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/vnech-tee-blue-1.jpg
rename to plugins/woocommerce/tests/e2e/test-data/images/vnech-tee-blue-1.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/vnech-tee-green-1.jpg b/plugins/woocommerce/tests/e2e/test-data/images/vnech-tee-green-1.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/vnech-tee-green-1.jpg
rename to plugins/woocommerce/tests/e2e/test-data/images/vnech-tee-green-1.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/images/vneck-tee-2.jpg b/plugins/woocommerce/tests/e2e/test-data/images/vneck-tee-2.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/images/vneck-tee-2.jpg
rename to plugins/woocommerce/tests/e2e/test-data/images/vneck-tee-2.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/sample_products.csv b/plugins/woocommerce/tests/e2e/test-data/sample_products.csv
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/sample_products.csv
rename to plugins/woocommerce/tests/e2e/test-data/sample_products.csv
diff --git a/plugins/woocommerce/tests/e2e-pw/test-data/sample_products_override.csv b/plugins/woocommerce/tests/e2e/test-data/sample_products_override.csv
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-data/sample_products_override.csv
rename to plugins/woocommerce/tests/e2e/test-data/sample_products_override.csv
diff --git a/plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/additional-checkout-fields.php b/plugins/woocommerce/tests/e2e/test-plugins/blocks/additional-checkout-fields.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/additional-checkout-fields.php
rename to plugins/woocommerce/tests/e2e/test-plugins/blocks/additional-checkout-fields.php
diff --git a/plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/cart-contents-count-filter.php b/plugins/woocommerce/tests/e2e/test-plugins/blocks/cart-contents-count-filter.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/cart-contents-count-filter.php
rename to plugins/woocommerce/tests/e2e/test-plugins/blocks/cart-contents-count-filter.php
diff --git a/plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/cart-extensions-test-helper.php b/plugins/woocommerce/tests/e2e/test-plugins/blocks/cart-extensions-test-helper.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/cart-extensions-test-helper.php
rename to plugins/woocommerce/tests/e2e/test-plugins/blocks/cart-extensions-test-helper.php
diff --git a/plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/custom-add-to-cart-button-text.php b/plugins/woocommerce/tests/e2e/test-plugins/blocks/custom-add-to-cart-button-text.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/custom-add-to-cart-button-text.php
rename to plugins/woocommerce/tests/e2e/test-plugins/blocks/custom-add-to-cart-button-text.php
diff --git a/plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/custom-place-order-button-test.php b/plugins/woocommerce/tests/e2e/test-plugins/blocks/custom-place-order-button-test.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/custom-place-order-button-test.php
rename to plugins/woocommerce/tests/e2e/test-plugins/blocks/custom-place-order-button-test.php
diff --git a/plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/custom-product-type.php b/plugins/woocommerce/tests/e2e/test-plugins/blocks/custom-product-type.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/custom-product-type.php
rename to plugins/woocommerce/tests/e2e/test-plugins/blocks/custom-product-type.php
diff --git a/plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/extension-cart-update.php b/plugins/woocommerce/tests/e2e/test-plugins/blocks/extension-cart-update.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/extension-cart-update.php
rename to plugins/woocommerce/tests/e2e/test-plugins/blocks/extension-cart-update.php
diff --git a/plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/item-data-display.php b/plugins/woocommerce/tests/e2e/test-plugins/blocks/item-data-display.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/item-data-display.php
rename to plugins/woocommerce/tests/e2e/test-plugins/blocks/item-data-display.php
diff --git a/plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/locale-hide-country.php b/plugins/woocommerce/tests/e2e/test-plugins/blocks/locale-hide-country.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/locale-hide-country.php
rename to plugins/woocommerce/tests/e2e/test-plugins/blocks/locale-hide-country.php
diff --git a/plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/order-confirmation-filters.php b/plugins/woocommerce/tests/e2e/test-plugins/blocks/order-confirmation-filters.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/order-confirmation-filters.php
rename to plugins/woocommerce/tests/e2e/test-plugins/blocks/order-confirmation-filters.php
diff --git a/plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/product-collection-compatibility-layer.php b/plugins/woocommerce/tests/e2e/test-plugins/blocks/product-collection-compatibility-layer.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/product-collection-compatibility-layer.php
rename to plugins/woocommerce/tests/e2e/test-plugins/blocks/product-collection-compatibility-layer.php
diff --git a/plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/quantity-constraints.php b/plugins/woocommerce/tests/e2e/test-plugins/blocks/quantity-constraints.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/quantity-constraints.php
rename to plugins/woocommerce/tests/e2e/test-plugins/blocks/quantity-constraints.php
diff --git a/plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/register-product-collection.js b/plugins/woocommerce/tests/e2e/test-plugins/blocks/register-product-collection.js
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/register-product-collection.js
rename to plugins/woocommerce/tests/e2e/test-plugins/blocks/register-product-collection.js
diff --git a/plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/register-product-collection.php b/plugins/woocommerce/tests/e2e/test-plugins/blocks/register-product-collection.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/register-product-collection.php
rename to plugins/woocommerce/tests/e2e/test-plugins/blocks/register-product-collection.php
diff --git a/plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/short-nonce-life.php b/plugins/woocommerce/tests/e2e/test-plugins/blocks/short-nonce-life.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/short-nonce-life.php
rename to plugins/woocommerce/tests/e2e/test-plugins/blocks/short-nonce-life.php
diff --git a/plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/single-product-template-compatibility-layer.php b/plugins/woocommerce/tests/e2e/test-plugins/blocks/single-product-template-compatibility-layer.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/single-product-template-compatibility-layer.php
rename to plugins/woocommerce/tests/e2e/test-plugins/blocks/single-product-template-compatibility-layer.php
diff --git a/plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/update-price.php b/plugins/woocommerce/tests/e2e/test-plugins/blocks/update-price.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-plugins/blocks/update-price.php
rename to plugins/woocommerce/tests/e2e/test-plugins/blocks/update-price.php
diff --git a/plugins/woocommerce/tests/e2e-pw/test-plugins/wc-email-template-sync-test-helper/includes/class-fake-third-party-email.php b/plugins/woocommerce/tests/e2e/test-plugins/wc-email-template-sync-test-helper/includes/class-fake-third-party-email.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-plugins/wc-email-template-sync-test-helper/includes/class-fake-third-party-email.php
rename to plugins/woocommerce/tests/e2e/test-plugins/wc-email-template-sync-test-helper/includes/class-fake-third-party-email.php
diff --git a/plugins/woocommerce/tests/e2e-pw/test-plugins/wc-email-template-sync-test-helper/includes/class-opted-in-overrides.php b/plugins/woocommerce/tests/e2e/test-plugins/wc-email-template-sync-test-helper/includes/class-opted-in-overrides.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-plugins/wc-email-template-sync-test-helper/includes/class-opted-in-overrides.php
rename to plugins/woocommerce/tests/e2e/test-plugins/wc-email-template-sync-test-helper/includes/class-opted-in-overrides.php
diff --git a/plugins/woocommerce/tests/e2e-pw/test-plugins/wc-email-template-sync-test-helper/includes/class-rest-controller.php b/plugins/woocommerce/tests/e2e/test-plugins/wc-email-template-sync-test-helper/includes/class-rest-controller.php
similarity index 99%
rename from plugins/woocommerce/tests/e2e-pw/test-plugins/wc-email-template-sync-test-helper/includes/class-rest-controller.php
rename to plugins/woocommerce/tests/e2e/test-plugins/wc-email-template-sync-test-helper/includes/class-rest-controller.php
index c26a4bfdc54..e082136815b 100644
--- a/plugins/woocommerce/tests/e2e-pw/test-plugins/wc-email-template-sync-test-helper/includes/class-rest-controller.php
+++ b/plugins/woocommerce/tests/e2e/test-plugins/wc-email-template-sync-test-helper/includes/class-rest-controller.php
@@ -19,7 +19,7 @@ defined( 'ABSPATH' ) || exit;
* Helper REST endpoints exposed under /wc-email-test-helper/v1/ for Playwright E2E tests.
*
* Health endpoint is open; every other route requires manage_options. The plugin's location
- * under tests/e2e-pw/test-plugins/ — only mounted via .wp-env.json for the test environment —
+ * under tests/e2e/test-plugins/ — only mounted via .wp-env.json for the test environment —
* provides the second layer of defense.
*/
class REST_Controller {
diff --git a/plugins/woocommerce/tests/e2e-pw/test-plugins/wc-email-template-sync-test-helper/includes/class-template-html-overrides.php b/plugins/woocommerce/tests/e2e/test-plugins/wc-email-template-sync-test-helper/includes/class-template-html-overrides.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-plugins/wc-email-template-sync-test-helper/includes/class-template-html-overrides.php
rename to plugins/woocommerce/tests/e2e/test-plugins/wc-email-template-sync-test-helper/includes/class-template-html-overrides.php
diff --git a/plugins/woocommerce/tests/e2e-pw/test-plugins/wc-email-template-sync-test-helper/includes/class-tracks-recorder.php b/plugins/woocommerce/tests/e2e/test-plugins/wc-email-template-sync-test-helper/includes/class-tracks-recorder.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-plugins/wc-email-template-sync-test-helper/includes/class-tracks-recorder.php
rename to plugins/woocommerce/tests/e2e/test-plugins/wc-email-template-sync-test-helper/includes/class-tracks-recorder.php
diff --git a/plugins/woocommerce/tests/e2e-pw/test-plugins/wc-email-template-sync-test-helper/wc-email-template-sync-test-helper.php b/plugins/woocommerce/tests/e2e/test-plugins/wc-email-template-sync-test-helper/wc-email-template-sync-test-helper.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/test-plugins/wc-email-template-sync-test-helper/wc-email-template-sync-test-helper.php
rename to plugins/woocommerce/tests/e2e/test-plugins/wc-email-template-sync-test-helper/wc-email-template-sync-test-helper.php
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/analytics/analytics-access.spec.ts b/plugins/woocommerce/tests/e2e/tests/analytics/analytics-access.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/analytics/analytics-access.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/analytics/analytics-access.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/analytics/analytics-data.spec.ts b/plugins/woocommerce/tests/e2e/tests/analytics/analytics-data.spec.ts
similarity index 99%
rename from plugins/woocommerce/tests/e2e-pw/tests/analytics/analytics-data.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/analytics/analytics-data.spec.ts
index 762f2fea974..9db5301bfc1 100644
--- a/plugins/woocommerce/tests/e2e-pw/tests/analytics/analytics-data.spec.ts
+++ b/plugins/woocommerce/tests/e2e/tests/analytics/analytics-data.spec.ts
@@ -324,7 +324,6 @@ test(
const downloadPromise = page.waitForEvent( 'download' );
await page.getByRole( 'button', { name: 'Download' } ).click();
const download = await downloadPromise;
- // eslint-disable-next-line jest/no-try-expect
await expect( download.suggestedFilename() ).toContain(
'revenue.csv'
);
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/analytics/analytics-overview.spec.ts b/plugins/woocommerce/tests/e2e/tests/analytics/analytics-overview.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/analytics/analytics-overview.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/analytics/analytics-overview.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/analytics/analytics-settings.spec.ts b/plugins/woocommerce/tests/e2e/tests/analytics/analytics-settings.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/analytics/analytics-settings.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/analytics/analytics-settings.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/api-tests/coupons/coupons.test.ts b/plugins/woocommerce/tests/e2e/tests/api-tests/coupons/coupons.test.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/api-tests/coupons/coupons.test.ts
rename to plugins/woocommerce/tests/e2e/tests/api-tests/coupons/coupons.test.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/api-tests/customers/customers-crud.test.ts b/plugins/woocommerce/tests/e2e/tests/api-tests/customers/customers-crud.test.ts
similarity index 99%
rename from plugins/woocommerce/tests/e2e-pw/tests/api-tests/customers/customers-crud.test.ts
rename to plugins/woocommerce/tests/e2e/tests/api-tests/customers/customers-crud.test.ts
index a64c5042ac5..117e83024c5 100644
--- a/plugins/woocommerce/tests/e2e-pw/tests/api-tests/customers/customers-crud.test.ts
+++ b/plugins/woocommerce/tests/e2e/tests/api-tests/customers/customers-crud.test.ts
@@ -85,7 +85,7 @@ test.describe( 'Customers API tests: CRUD', () => {
test.describe( 'Retrieve after env setup', () => {
/**
* when the environment is created,
- * (https://github.com/woocommerce/woocommerce/tree/trunk/plugins/woocommerce/tests/e2e-pw#woocommerce-playwright-end-to-end-tests),
+ * (https://github.com/woocommerce/woocommerce/tree/trunk/plugins/woocommerce/tests/e2e#woocommerce-playwright-end-to-end-tests),
* we have an admin user and a subscriber user that can both be
* accessed through their ids
* neither of these are returned as part of the get all customers call
@@ -231,7 +231,7 @@ test.describe( 'Customers API tests: CRUD', () => {
/**
* update customer names (regular, billing and shipping) to admin
* (these were initialised blank when the environment is created,
- * (https://github.com/woocommerce/woocommerce/tree/trunk/plugins/woocommerce/tests/e2e-pw#woocommerce-playwright-end-to-end-tests
+ * (https://github.com/woocommerce/woocommerce/tree/trunk/plugins/woocommerce/tests/e2e#woocommerce-playwright-end-to-end-tests
*/
const response = await request.put(
`./wp-json/wc/v3/customers/${ adminId }`,
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/api-tests/data/data-crud.test.ts b/plugins/woocommerce/tests/e2e/tests/api-tests/data/data-crud.test.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/api-tests/data/data-crud.test.ts
rename to plugins/woocommerce/tests/e2e/tests/api-tests/data/data-crud.test.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/api-tests/hello/hello.test.ts b/plugins/woocommerce/tests/e2e/tests/api-tests/hello/hello.test.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/api-tests/hello/hello.test.ts
rename to plugins/woocommerce/tests/e2e/tests/api-tests/hello/hello.test.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/api-tests/orders/order-complex.test.ts b/plugins/woocommerce/tests/e2e/tests/api-tests/orders/order-complex.test.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/api-tests/orders/order-complex.test.ts
rename to plugins/woocommerce/tests/e2e/tests/api-tests/orders/order-complex.test.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/api-tests/orders/order-search.test.ts b/plugins/woocommerce/tests/e2e/tests/api-tests/orders/order-search.test.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/api-tests/orders/order-search.test.ts
rename to plugins/woocommerce/tests/e2e/tests/api-tests/orders/order-search.test.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/api-tests/orders/orders-crud.test.ts b/plugins/woocommerce/tests/e2e/tests/api-tests/orders/orders-crud.test.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/api-tests/orders/orders-crud.test.ts
rename to plugins/woocommerce/tests/e2e/tests/api-tests/orders/orders-crud.test.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/api-tests/orders/orders.test.ts b/plugins/woocommerce/tests/e2e/tests/api-tests/orders/orders.test.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/api-tests/orders/orders.test.ts
rename to plugins/woocommerce/tests/e2e/tests/api-tests/orders/orders.test.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/api-tests/payment-gateways/payment-gateways-crud.test.ts b/plugins/woocommerce/tests/e2e/tests/api-tests/payment-gateways/payment-gateways-crud.test.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/api-tests/payment-gateways/payment-gateways-crud.test.ts
rename to plugins/woocommerce/tests/e2e/tests/api-tests/payment-gateways/payment-gateways-crud.test.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/api-tests/products/product-list.test.ts b/plugins/woocommerce/tests/e2e/tests/api-tests/products/product-list.test.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/api-tests/products/product-list.test.ts
rename to plugins/woocommerce/tests/e2e/tests/api-tests/products/product-list.test.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/api-tests/products/products-crud.test.ts b/plugins/woocommerce/tests/e2e/tests/api-tests/products/products-crud.test.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/api-tests/products/products-crud.test.ts
rename to plugins/woocommerce/tests/e2e/tests/api-tests/products/products-crud.test.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/api-tests/refunds/refunds.test.ts b/plugins/woocommerce/tests/e2e/tests/api-tests/refunds/refunds.test.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/api-tests/refunds/refunds.test.ts
rename to plugins/woocommerce/tests/e2e/tests/api-tests/refunds/refunds.test.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/api-tests/reports/reports-crud.test.ts b/plugins/woocommerce/tests/e2e/tests/api-tests/reports/reports-crud.test.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/api-tests/reports/reports-crud.test.ts
rename to plugins/woocommerce/tests/e2e/tests/api-tests/reports/reports-crud.test.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/api-tests/settings/settings-crud.test.ts b/plugins/woocommerce/tests/e2e/tests/api-tests/settings/settings-crud.test.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/api-tests/settings/settings-crud.test.ts
rename to plugins/woocommerce/tests/e2e/tests/api-tests/settings/settings-crud.test.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/api-tests/shipping/shipping-method.test.ts b/plugins/woocommerce/tests/e2e/tests/api-tests/shipping/shipping-method.test.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/api-tests/shipping/shipping-method.test.ts
rename to plugins/woocommerce/tests/e2e/tests/api-tests/shipping/shipping-method.test.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/api-tests/shipping/shipping-zones.test.ts b/plugins/woocommerce/tests/e2e/tests/api-tests/shipping/shipping-zones.test.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/api-tests/shipping/shipping-zones.test.ts
rename to plugins/woocommerce/tests/e2e/tests/api-tests/shipping/shipping-zones.test.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/api-tests/system-status/system-status-crud.test.ts b/plugins/woocommerce/tests/e2e/tests/api-tests/system-status/system-status-crud.test.ts
similarity index 99%
rename from plugins/woocommerce/tests/e2e-pw/tests/api-tests/system-status/system-status-crud.test.ts
rename to plugins/woocommerce/tests/e2e/tests/api-tests/system-status/system-status-crud.test.ts
index edce462c109..385de01a7c8 100644
--- a/plugins/woocommerce/tests/e2e-pw/tests/api-tests/system-status/system-status-crud.test.ts
+++ b/plugins/woocommerce/tests/e2e/tests/api-tests/system-status/system-status-crud.test.ts
@@ -19,6 +19,7 @@ const expect = baseExpect.extend( {
let matcherResult: any;
try {
+ // eslint-disable-next-line playwright/no-standalone-expect -- Custom matcher definition, not a standalone assertion.
baseExpect( expectedTypes ).toContain( typeof received );
pass = true;
} catch ( e ) {
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/api-tests/taxes/tax-classes-crud.test.ts b/plugins/woocommerce/tests/e2e/tests/api-tests/taxes/tax-classes-crud.test.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/api-tests/taxes/tax-classes-crud.test.ts
rename to plugins/woocommerce/tests/e2e/tests/api-tests/taxes/tax-classes-crud.test.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/api-tests/taxes/tax-rates-crud.test.ts b/plugins/woocommerce/tests/e2e/tests/api-tests/taxes/tax-rates-crud.test.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/api-tests/taxes/tax-rates-crud.test.ts
rename to plugins/woocommerce/tests/e2e/tests/api-tests/taxes/tax-rates-crud.test.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/api-tests/webhooks/webhooks-crud.test.ts b/plugins/woocommerce/tests/e2e/tests/api-tests/webhooks/webhooks-crud.test.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/api-tests/webhooks/webhooks-crud.test.ts
rename to plugins/woocommerce/tests/e2e/tests/api-tests/webhooks/webhooks-crud.test.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/basic/dashboard-access.spec.ts b/plugins/woocommerce/tests/e2e/tests/basic/dashboard-access.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/basic/dashboard-access.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/basic/dashboard-access.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/basic/page-loads.spec.ts b/plugins/woocommerce/tests/e2e/tests/basic/page-loads.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/basic/page-loads.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/basic/page-loads.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/accordion/accordion.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/accordion/accordion.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/accordion/accordion.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/accordion/accordion.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/accordion/accordion.page.ts b/plugins/woocommerce/tests/e2e/tests/blocks/accordion/accordion.page.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/accordion/accordion.page.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/accordion/accordion.page.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/add-to-cart-form/add-to-cart-form.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/add-to-cart-form/add-to-cart-form.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/add-to-cart-form/add-to-cart-form.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/add-to-cart-form/add-to-cart-form.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/add-to-cart-with-options/add-to-cart-with-options.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/add-to-cart-with-options/add-to-cart-with-options.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/add-to-cart-with-options/add-to-cart-with-options.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/add-to-cart-with-options/add-to-cart-with-options.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/add-to-cart-with-options/add-to-cart-with-options.block_theme_with_templates.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/add-to-cart-with-options/add-to-cart-with-options.block_theme_with_templates.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/add-to-cart-with-options/add-to-cart-with-options.block_theme_with_templates.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/add-to-cart-with-options/add-to-cart-with-options.block_theme_with_templates.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/add-to-cart-with-options/add-to-cart-with-options.page.ts b/plugins/woocommerce/tests/e2e/tests/blocks/add-to-cart-with-options/add-to-cart-with-options.page.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/add-to-cart-with-options/add-to-cart-with-options.page.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/add-to-cart-with-options/add-to-cart-with-options.page.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/all-products/all-products.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/all-products/all-products.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/all-products/all-products.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/all-products/all-products.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/all-reviews/all-reviews.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/all-reviews/all-reviews.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/all-reviews/all-reviews.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/all-reviews/all-reviews.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/attributes-filter/attribute-filter.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/attributes-filter/attribute-filter.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/attributes-filter/attribute-filter.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/attributes-filter/attribute-filter.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/attributes-filter/filter-products-by-attributes-count.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/attributes-filter/filter-products-by-attributes-count.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/attributes-filter/filter-products-by-attributes-count.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/attributes-filter/filter-products-by-attributes-count.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/basic.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/basic.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/basic.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/basic.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/breadcrumbs/breadcrumbs.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/breadcrumbs/breadcrumbs.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/breadcrumbs/breadcrumbs.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/breadcrumbs/breadcrumbs.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-block.merchant.classic_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/cart/cart-block.merchant.classic_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-block.merchant.classic_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/cart/cart-block.merchant.classic_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-block.perf.ts b/plugins/woocommerce/tests/e2e/tests/blocks/cart/cart-block.perf.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-block.perf.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/cart/cart-block.perf.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-block.shopper.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/cart/cart-block.shopper.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-block.shopper.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/cart/cart-block.shopper.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-coupons.shopper.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/cart/cart-checkout-block-coupons.shopper.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-coupons.shopper.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/cart/cart-checkout-block-coupons.shopper.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-extension-callbacks.shopper.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/cart/cart-checkout-block-extension-callbacks.shopper.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-extension-callbacks.shopper.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/cart/cart-checkout-block-extension-callbacks.shopper.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-notices.shopper.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/cart/cart-checkout-block-notices.shopper.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-notices.shopper.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/cart/cart-checkout-block-notices.shopper.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-notices.shopper.classic_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/cart/cart-checkout-block-notices.shopper.classic_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-notices.shopper.classic_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/cart/cart-checkout-block-notices.shopper.classic_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-shipping.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/cart/cart-checkout-block-shipping.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-shipping.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/cart/cart-checkout-block-shipping.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-taxes.shopper.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/cart/cart-checkout-block-taxes.shopper.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-taxes.shopper.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/cart/cart-checkout-block-taxes.shopper.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-translations.shopper.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/cart/cart-checkout-block-translations.shopper.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-translations.shopper.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/cart/cart-checkout-block-translations.shopper.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-store.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/cart/cart-store.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-store.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/cart/cart-store.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart.page.ts b/plugins/woocommerce/tests/e2e/tests/blocks/cart/cart.page.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart.page.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/cart/cart.page.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/catalog-sorting/catalog-sorting.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/catalog-sorting/catalog-sorting.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/catalog-sorting/catalog-sorting.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/catalog-sorting/catalog-sorting.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/additional-fields.guest-shopper.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/checkout/additional-fields.guest-shopper.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/additional-fields.guest-shopper.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/checkout/additional-fields.guest-shopper.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/additional-fields.merchant.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/checkout/additional-fields.merchant.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/additional-fields.merchant.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/checkout/additional-fields.merchant.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/additional-fields.shopper.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/checkout/additional-fields.shopper.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/additional-fields.shopper.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/checkout/additional-fields.shopper.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout-block-custom-place-order-button.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/checkout/checkout-block-custom-place-order-button.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout-block-custom-place-order-button.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/checkout/checkout-block-custom-place-order-button.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout-block-extensibility.shopper.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/checkout/checkout-block-extensibility.shopper.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout-block-extensibility.shopper.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/checkout/checkout-block-extensibility.shopper.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout-block-locale-hide-country.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/checkout/checkout-block-locale-hide-country.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout-block-locale-hide-country.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/checkout/checkout-block-locale-hide-country.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout-block.merchant.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/checkout/checkout-block.merchant.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout-block.merchant.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/checkout/checkout-block.merchant.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout-block.merchant.classic_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/checkout/checkout-block.merchant.classic_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout-block.merchant.classic_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/checkout/checkout-block.merchant.classic_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout-block.shopper.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/checkout/checkout-block.shopper.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout-block.shopper.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/checkout/checkout-block.shopper.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout.page.ts b/plugins/woocommerce/tests/e2e/tests/blocks/checkout/checkout.page.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout.page.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/checkout/checkout.page.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/constants.ts b/plugins/woocommerce/tests/e2e/tests/blocks/checkout/constants.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/constants.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/checkout/constants.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/order-confirmation.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/checkout/order-confirmation.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/order-confirmation.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/checkout/order-confirmation.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/classic-template/classic-template.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/classic-template/classic-template.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/classic-template/classic-template.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/classic-template/classic-template.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/classic-template/utils.ts b/plugins/woocommerce/tests/e2e/tests/blocks/classic-template/utils.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/classic-template/utils.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/classic-template/utils.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/customer-account/customer-account.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/customer-account/customer-account.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/customer-account/customer-account.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/customer-account/customer-account.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/featured-category/featured-category.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/featured-category/featured-category.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/featured-category/featured-category.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/featured-category/featured-category.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/featured-product/featured-product.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/featured-product/featured-product.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/featured-product/featured-product.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/featured-product/featured-product.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/handpicked-products/handpicked-products.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/handpicked-products/handpicked-products.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/handpicked-products/handpicked-products.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/handpicked-products/handpicked-products.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/local-pickup/local-pickup.merchant.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/local-pickup/local-pickup.merchant.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/local-pickup/local-pickup.merchant.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/local-pickup/local-pickup.merchant.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/mini-cart/mini-cart-block.merchant.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/mini-cart/mini-cart-block.merchant.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/mini-cart/mini-cart-block.merchant.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/mini-cart/mini-cart-block.merchant.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/mini-cart/mini-cart-block.shopper.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/mini-cart/mini-cart-block.shopper.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/mini-cart/mini-cart-block.shopper.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/mini-cart/mini-cart-block.shopper.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/mini-cart/mini-cart.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/mini-cart/mini-cart.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/mini-cart/mini-cart.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/mini-cart/mini-cart.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/mini-cart/mini-cart.classic_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/mini-cart/mini-cart.classic_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/mini-cart/mini-cart.classic_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/mini-cart/mini-cart.classic_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/mini-cart/utils.ts b/plugins/woocommerce/tests/e2e/tests/blocks/mini-cart/utils.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/mini-cart/utils.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/mini-cart/utils.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/mutation-batcher/mutation-batcher.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/mutation-batcher/mutation-batcher.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/mutation-batcher/mutation-batcher.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/mutation-batcher/mutation-batcher.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/on-sale-badge/on-sale-badge-single-product-template.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/on-sale-badge/on-sale-badge-single-product-template.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/on-sale-badge/on-sale-badge-single-product-template.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/on-sale-badge/on-sale-badge-single-product-template.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/page-content-wrapper/page-content-wrapper.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/page-content-wrapper/page-content-wrapper.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/page-content-wrapper/page-content-wrapper.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/page-content-wrapper/page-content-wrapper.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/patterns/add-new-pattern.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/patterns/add-new-pattern.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/patterns/add-new-pattern.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/patterns/add-new-pattern.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/patterns/add-new-pattern.classic_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/patterns/add-new-pattern.classic_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/patterns/add-new-pattern.classic_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/patterns/add-new-pattern.classic_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/patterns/utils.ts b/plugins/woocommerce/tests/e2e/tests/blocks/patterns/utils.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/patterns/utils.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/patterns/utils.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/price-filter/price-filter.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/price-filter/price-filter.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/price-filter/price-filter.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/price-filter/price-filter.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-best-sellers/product-best-sellers.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-best-sellers/product-best-sellers.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-best-sellers/product-best-sellers.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-best-sellers/product-best-sellers.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-button/product-button.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-button/product-button.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-button/product-button.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-button/product-button.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-button/product-button.classic_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-button/product-button.classic_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-button/product-button.classic_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-button/product-button.classic_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-button/utils.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-button/utils.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-button/utils.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-button/utils.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-categories/product-categories.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-categories/product-categories.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-categories/product-categories.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-categories/product-categories.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-category/product-category.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-category/product-category.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-category/product-category.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-category/product-category.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/collection-pickers.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-collection/collection-pickers.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/collection-pickers.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-collection/collection-pickers.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/collections.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-collection/collections.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/collections.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-collection/collections.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/compatibility-layer.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-collection/compatibility-layer.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/compatibility-layer.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-collection/compatibility-layer.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/extensibility-events.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-collection/extensibility-events.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/extensibility-events.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-collection/extensibility-events.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/inspector-controls.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-collection/inspector-controls.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/inspector-controls.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-collection/inspector-controls.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/product-collection-errors.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-collection/product-collection-errors.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/product-collection-errors.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-collection/product-collection-errors.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/product-collection.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-collection/product-collection.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/product-collection.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-collection/product-collection.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/product-collection.page.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-collection/product-collection.page.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/product-collection.page.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-collection/product-collection.page.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/product-picker.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-collection/product-picker.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/product-picker.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-collection/product-picker.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/register-product-collection.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-collection/register-product-collection.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/register-product-collection.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-collection/register-product-collection.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/active-filter-frontend.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-filters/active-filter-frontend.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/active-filter-frontend.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-filters/active-filter-frontend.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/attribute-filter-editor.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-filters/attribute-filter-editor.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/attribute-filter-editor.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-filters/attribute-filter-editor.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/attribute-filter-frontend.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-filters/attribute-filter-frontend.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/attribute-filter-frontend.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-filters/attribute-filter-frontend.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/price-filter-editor.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-filters/price-filter-editor.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/price-filter-editor.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-filters/price-filter-editor.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/product-filters-frontend.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-filters/product-filters-frontend.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/product-filters-frontend.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-filters/product-filters-frontend.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/product-filters.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-filters/product-filters.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/product-filters.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-filters/product-filters.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/product-filters.page.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-filters/product-filters.page.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/product-filters.page.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-filters/product-filters.page.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/rating-filter-editor.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-filters/rating-filter-editor.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/rating-filter-editor.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-filters/rating-filter-editor.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/removable-chips-editor.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-filters/removable-chips-editor.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/removable-chips-editor.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-filters/removable-chips-editor.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-gallery/inner-blocks/product-gallery-large-image/product-gallery-large-image.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-gallery/inner-blocks/product-gallery-large-image/product-gallery-large-image.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-gallery/inner-blocks/product-gallery-large-image/product-gallery-large-image.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-gallery/inner-blocks/product-gallery-large-image/product-gallery-large-image.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-gallery/inner-blocks/product-gallery-thumbnails/product-gallery-thumbnails.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-gallery/inner-blocks/product-gallery-thumbnails/product-gallery-thumbnails.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-gallery/inner-blocks/product-gallery-thumbnails/product-gallery-thumbnails.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-gallery/inner-blocks/product-gallery-thumbnails/product-gallery-thumbnails.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-gallery/product-gallery.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-gallery/product-gallery.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-gallery/product-gallery.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-gallery/product-gallery.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-gallery/product-gallery.page.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-gallery/product-gallery.page.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-gallery/product-gallery.page.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-gallery/product-gallery.page.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-image-gallery/product-image-gallery.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-image-gallery/product-image-gallery.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-image-gallery/product-image-gallery.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-image-gallery/product-image-gallery.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-new/product-new.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-new/product-new.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-new/product-new.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-new/product-new.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-on-sale/product-on-sale.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-on-sale/product-on-sale.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-on-sale/product-on-sale.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-on-sale/product-on-sale.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-results-count/product-results-count.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-results-count/product-results-count.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-results-count/product-results-count.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-results-count/product-results-count.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-tag/product-tag.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-tag/product-tag.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-tag/product-tag.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-tag/product-tag.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-top-rated/product-top-rated.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/product-top-rated/product-top-rated.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/product-top-rated/product-top-rated.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/product-top-rated/product-top-rated.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/products-by-attribute/products-by-attribute.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/products-by-attribute/products-by-attribute.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/products-by-attribute/products-by-attribute.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/products-by-attribute/products-by-attribute.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/products/products.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/products/products.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/products/products.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/products/products.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/products/utils.ts b/plugins/woocommerce/tests/e2e/tests/blocks/products/utils.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/products/utils.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/products/utils.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/rating-filter/rating-filter.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/rating-filter/rating-filter.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/rating-filter/rating-filter.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/rating-filter/rating-filter.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/related-products/related-products.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/related-products/related-products.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/related-products/related-products.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/related-products/related-products.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/reviews-by-category/reviews-by-category.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/reviews-by-category/reviews-by-category.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/reviews-by-category/reviews-by-category.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/reviews-by-category/reviews-by-category.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/reviews-by-product/reviews-by-product.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/reviews-by-product/reviews-by-product.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/reviews-by-product/reviews-by-product.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/reviews-by-product/reviews-by-product.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/single-product-details/single-product-details.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/single-product-details/single-product-details.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/single-product-details/single-product-details.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/single-product-details/single-product-details.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/single-product-template/single-product-template-compatibility-layer.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/single-product-template/single-product-template-compatibility-layer.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/single-product-template/single-product-template-compatibility-layer.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/single-product-template/single-product-template-compatibility-layer.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/single-product-template/single-product-template.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/single-product-template/single-product-template.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/single-product-template/single-product-template.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/single-product-template/single-product-template.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/single-product-template/single-product-template.product-rating.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/single-product-template/single-product-template.product-rating.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/single-product-template/single-product-template.product-rating.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/single-product-template/single-product-template.product-rating.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/single-product/product-rating-single-product.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/single-product/product-rating-single-product.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/single-product/product-rating-single-product.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/single-product/product-rating-single-product.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/stock-filter/stock-filter.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/stock-filter/stock-filter.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/stock-filter/stock-filter.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/stock-filter/stock-filter.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/store-notices/store-notices.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/store-notices/store-notices.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/store-notices/store-notices.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/store-notices/store-notices.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/style.classic_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/style.classic_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/style.classic_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/style.classic_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/cart-template.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/templates/cart-template.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/cart-template.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/templates/cart-template.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/checkout-template.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/templates/checkout-template.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/checkout-template.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/templates/checkout-template.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/constants.ts b/plugins/woocommerce/tests/e2e/tests/blocks/templates/constants.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/constants.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/templates/constants.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/legacy-templates.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/templates/legacy-templates.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/legacy-templates.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/templates/legacy-templates.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/order-confirmation.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/templates/order-confirmation.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/order-confirmation.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/templates/order-confirmation.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/product-search-results.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/templates/product-search-results.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/product-search-results.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/templates/product-search-results.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/shop-page.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/templates/shop-page.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/shop-page.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/templates/shop-page.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/single-product-template.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/templates/single-product-template.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/single-product-template.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/templates/single-product-template.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/single-product-template.block_theme_with_templates.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/templates/single-product-template.block_theme_with_templates.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/single-product-template.block_theme_with_templates.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/templates/single-product-template.block_theme_with_templates.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/template-customization.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/templates/template-customization.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/template-customization.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/templates/template-customization.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/template-customization.block_theme_with_templates.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/templates/template-customization.block_theme_with_templates.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/template-customization.block_theme_with_templates.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/templates/template-customization.block_theme_with_templates.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/template-part-customization.classic_theme_with_template_parts.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/templates/template-part-customization.classic_theme_with_template_parts.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/template-part-customization.classic_theme_with_template_parts.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/templates/template-part-customization.classic_theme_with_template_parts.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/template-part-customization.classic_theme_with_template_parts_support.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/templates/template-part-customization.classic_theme_with_template_parts_support.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/template-part-customization.classic_theme_with_template_parts_support.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/templates/template-part-customization.classic_theme_with_template_parts_support.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/template-priority.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/templates/template-priority.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/template-priority.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/templates/template-priority.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/templates.page.ts b/plugins/woocommerce/tests/e2e/tests/blocks/templates/templates.page.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/templates.page.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/templates/templates.page.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/blocks/utils/register-block-single-product-template.block_theme.spec.ts b/plugins/woocommerce/tests/e2e/tests/blocks/utils/register-block-single-product-template.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/blocks/utils/register-block-single-product-template.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/blocks/utils/register-block-single-product-template.block_theme.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/brands/create-product-brand.spec.ts b/plugins/woocommerce/tests/e2e/tests/brands/create-product-brand.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/brands/create-product-brand.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/brands/create-product-brand.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/cart/add-to-cart.spec.ts b/plugins/woocommerce/tests/e2e/tests/cart/add-to-cart.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/cart/add-to-cart.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/cart/add-to-cart.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/cart/cart.spec.ts b/plugins/woocommerce/tests/e2e/tests/cart/cart.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/cart/cart.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/cart/cart.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/checkout/checkout-link.spec.ts b/plugins/woocommerce/tests/e2e/tests/checkout/checkout-link.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/checkout/checkout-link.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/checkout/checkout-link.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/checkout/checkout-shortcode-custom-place-order-button.spec.ts b/plugins/woocommerce/tests/e2e/tests/checkout/checkout-shortcode-custom-place-order-button.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/checkout/checkout-shortcode-custom-place-order-button.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/checkout/checkout-shortcode-custom-place-order-button.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/checkout/checkout.spec.ts b/plugins/woocommerce/tests/e2e/tests/checkout/checkout.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/checkout/checkout.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/checkout/checkout.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/coupons/cart-block-coupons.spec.ts b/plugins/woocommerce/tests/e2e/tests/coupons/cart-block-coupons.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/coupons/cart-block-coupons.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/coupons/cart-block-coupons.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/coupons/cart-checkout-coupons.spec.ts b/plugins/woocommerce/tests/e2e/tests/coupons/cart-checkout-coupons.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/coupons/cart-checkout-coupons.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/coupons/cart-checkout-coupons.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/coupons/cart-checkout-restricted-coupons.spec.ts b/plugins/woocommerce/tests/e2e/tests/coupons/cart-checkout-restricted-coupons.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/coupons/cart-checkout-restricted-coupons.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/coupons/cart-checkout-restricted-coupons.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/coupons/coupons.spec.ts b/plugins/woocommerce/tests/e2e/tests/coupons/coupons.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/coupons/coupons.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/coupons/coupons.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/customer/customer-list.spec.ts b/plugins/woocommerce/tests/e2e/tests/customer/customer-list.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/customer/customer-list.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/customer/customer-list.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/editor/command-palette.spec.ts b/plugins/woocommerce/tests/e2e/tests/editor/command-palette.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/editor/command-palette.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/editor/command-palette.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/email-editor/email-editor-loads.spec.ts b/plugins/woocommerce/tests/e2e/tests/email-editor/email-editor-loads.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/email-editor/email-editor-loads.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/email-editor/email-editor-loads.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/email-editor/email-editor-reset-template.spec.ts b/plugins/woocommerce/tests/e2e/tests/email-editor/email-editor-reset-template.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/email-editor/email-editor-reset-template.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/email-editor/email-editor-reset-template.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/email-editor/email-editor-settings-sidebar.spec.ts b/plugins/woocommerce/tests/e2e/tests/email-editor/email-editor-settings-sidebar.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/email-editor/email-editor-settings-sidebar.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/email-editor/email-editor-settings-sidebar.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/email-editor/helpers/enable-email-editor-feature.ts b/plugins/woocommerce/tests/e2e/tests/email-editor/helpers/enable-email-editor-feature.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/email-editor/helpers/enable-email-editor-feature.ts
rename to plugins/woocommerce/tests/e2e/tests/email-editor/helpers/enable-email-editor-feature.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/email-editor/update-propagation/backward-compat.spec.ts b/plugins/woocommerce/tests/e2e/tests/email-editor/update-propagation/backward-compat.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/email-editor/update-propagation/backward-compat.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/email-editor/update-propagation/backward-compat.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/email-editor/update-propagation/core-flows.spec.ts b/plugins/woocommerce/tests/e2e/tests/email-editor/update-propagation/core-flows.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/email-editor/update-propagation/core-flows.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/email-editor/update-propagation/core-flows.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/email-editor/update-propagation/helpers/classifications.ts b/plugins/woocommerce/tests/e2e/tests/email-editor/update-propagation/helpers/classifications.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/email-editor/update-propagation/helpers/classifications.ts
rename to plugins/woocommerce/tests/e2e/tests/email-editor/update-propagation/helpers/classifications.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/email-editor/update-propagation/helpers/leaked-state-checks.ts b/plugins/woocommerce/tests/e2e/tests/email-editor/update-propagation/helpers/leaked-state-checks.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/email-editor/update-propagation/helpers/leaked-state-checks.ts
rename to plugins/woocommerce/tests/e2e/tests/email-editor/update-propagation/helpers/leaked-state-checks.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/email-editor/update-propagation/helpers/seed-woo-email.ts b/plugins/woocommerce/tests/e2e/tests/email-editor/update-propagation/helpers/seed-woo-email.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/email-editor/update-propagation/helpers/seed-woo-email.ts
rename to plugins/woocommerce/tests/e2e/tests/email-editor/update-propagation/helpers/seed-woo-email.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/email-editor/update-propagation/helpers/simulate-plugin-update.ts b/plugins/woocommerce/tests/e2e/tests/email-editor/update-propagation/helpers/simulate-plugin-update.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/email-editor/update-propagation/helpers/simulate-plugin-update.ts
rename to plugins/woocommerce/tests/e2e/tests/email-editor/update-propagation/helpers/simulate-plugin-update.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/email-editor/update-propagation/helpers/test-helper-plugin.ts b/plugins/woocommerce/tests/e2e/tests/email-editor/update-propagation/helpers/test-helper-plugin.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/email-editor/update-propagation/helpers/test-helper-plugin.ts
rename to plugins/woocommerce/tests/e2e/tests/email-editor/update-propagation/helpers/test-helper-plugin.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/email-editor/update-propagation/helpers/tracks-spy.ts b/plugins/woocommerce/tests/e2e/tests/email-editor/update-propagation/helpers/tracks-spy.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/email-editor/update-propagation/helpers/tracks-spy.ts
rename to plugins/woocommerce/tests/e2e/tests/email-editor/update-propagation/helpers/tracks-spy.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/email-editor/update-propagation/round-trip-idempotency.spec.ts b/plugins/woocommerce/tests/e2e/tests/email-editor/update-propagation/round-trip-idempotency.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/email-editor/update-propagation/round-trip-idempotency.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/email-editor/update-propagation/round-trip-idempotency.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/email-editor/update-propagation/scope.spec.ts b/plugins/woocommerce/tests/e2e/tests/email-editor/update-propagation/scope.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/email-editor/update-propagation/scope.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/email-editor/update-propagation/scope.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/email/account-emails.spec.ts b/plugins/woocommerce/tests/e2e/tests/email/account-emails.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/email/account-emails.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/email/account-emails.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/email/editor-tracking-selectors.spec.ts b/plugins/woocommerce/tests/e2e/tests/email/editor-tracking-selectors.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/email/editor-tracking-selectors.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/email/editor-tracking-selectors.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/email/helpers/set-email-improvements-feature-flag.ts b/plugins/woocommerce/tests/e2e/tests/email/helpers/set-email-improvements-feature-flag.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/email/helpers/set-email-improvements-feature-flag.ts
rename to plugins/woocommerce/tests/e2e/tests/email/helpers/set-email-improvements-feature-flag.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/email/order-emails.spec.ts b/plugins/woocommerce/tests/e2e/tests/email/order-emails.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/email/order-emails.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/email/order-emails.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/email/settings-email-listing.spec.ts b/plugins/woocommerce/tests/e2e/tests/email/settings-email-listing.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/email/settings-email-listing.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/email/settings-email-listing.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/email/settings-email.spec.ts b/plugins/woocommerce/tests/e2e/tests/email/settings-email.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/email/settings-email.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/email/settings-email.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/js-file-monitor/monitor-js-file-number.spec.ts b/plugins/woocommerce/tests/e2e/tests/js-file-monitor/monitor-js-file-number.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/js-file-monitor/monitor-js-file-number.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/js-file-monitor/monitor-js-file-number.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/marketing/overview.spec.ts b/plugins/woocommerce/tests/e2e/tests/marketing/overview.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/marketing/overview.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/marketing/overview.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/my-account/my-account-addresses.spec.ts b/plugins/woocommerce/tests/e2e/tests/my-account/my-account-addresses.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/my-account/my-account-addresses.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/my-account/my-account-addresses.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/my-account/my-account-create-account.spec.ts b/plugins/woocommerce/tests/e2e/tests/my-account/my-account-create-account.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/my-account/my-account-create-account.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/my-account/my-account-create-account.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/my-account/my-account-downloads.spec.ts b/plugins/woocommerce/tests/e2e/tests/my-account/my-account-downloads.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/my-account/my-account-downloads.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/my-account/my-account-downloads.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/my-account/my-account-pay-order.spec.ts b/plugins/woocommerce/tests/e2e/tests/my-account/my-account-pay-order.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/my-account/my-account-pay-order.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/my-account/my-account-pay-order.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/my-account/my-account.spec.ts b/plugins/woocommerce/tests/e2e/tests/my-account/my-account.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/my-account/my-account.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/my-account/my-account.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/onboarding/add-product-task.spec.ts b/plugins/woocommerce/tests/e2e/tests/onboarding/add-product-task.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/onboarding/add-product-task.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/onboarding/add-product-task.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/onboarding/launch-your-store.spec.ts b/plugins/woocommerce/tests/e2e/tests/onboarding/launch-your-store.spec.ts
similarity index 96%
rename from plugins/woocommerce/tests/e2e-pw/tests/onboarding/launch-your-store.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/onboarding/launch-your-store.spec.ts
index 5ffcb5e18d2..f618cfd4b7a 100644
--- a/plugins/woocommerce/tests/e2e-pw/tests/onboarding/launch-your-store.spec.ts
+++ b/plugins/woocommerce/tests/e2e/tests/onboarding/launch-your-store.spec.ts
@@ -287,7 +287,7 @@ test.describe(
}
);
-async function runComingSoonTests( themeContext = '' ) {
+function runComingSoonTests( themeContext = '' ) {
const testSuffix = themeContext ? ` (${ themeContext })` : '';
test( `Entire site coming soon mode${ testSuffix }`, async ( {
@@ -371,7 +371,7 @@ test.describe( 'Launch Your Store front end - logged out', () => {
}
} );
- test.describe( 'Block Theme (Twenty Twenty Four)', async () => {
+ test.describe( 'Block Theme (Twenty Twenty Four)', () => {
test.beforeAll( async ( { baseURL } ) => {
await activateTheme( baseURL, 'twentytwentyfour' );
} );
@@ -381,10 +381,10 @@ test.describe( 'Launch Your Store front end - logged out', () => {
await activateTheme( baseURL, DEFAULT_THEME );
} );
- await runComingSoonTests( 'Block Theme (Twenty Twenty Four)' );
+ runComingSoonTests( 'Block Theme (Twenty Twenty Four)' );
} );
- test.describe( 'Classic Theme (Storefront)', async () => {
+ test.describe( 'Classic Theme (Storefront)', () => {
test.beforeAll( async ( { baseURL } ) => {
await activateTheme( baseURL, 'storefront' );
} );
@@ -394,6 +394,6 @@ test.describe( 'Launch Your Store front end - logged out', () => {
await activateTheme( baseURL, DEFAULT_THEME );
} );
- await runComingSoonTests( 'Classic Theme (Storefront)' );
+ runComingSoonTests( 'Classic Theme (Storefront)' );
} );
} );
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/onboarding/nox-onboarding.spec.ts b/plugins/woocommerce/tests/e2e/tests/onboarding/nox-onboarding.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/onboarding/nox-onboarding.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/onboarding/nox-onboarding.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/onboarding/onboarding-wizard.spec.ts b/plugins/woocommerce/tests/e2e/tests/onboarding/onboarding-wizard.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/onboarding/onboarding-wizard.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/onboarding/onboarding-wizard.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/onboarding/setup-checklist.spec.ts b/plugins/woocommerce/tests/e2e/tests/onboarding/setup-checklist.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/onboarding/setup-checklist.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/onboarding/setup-checklist.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/order/create-order.spec.ts b/plugins/woocommerce/tests/e2e/tests/order/create-order.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/order/create-order.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/order/create-order.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/order/customer-payment-page.spec.ts b/plugins/woocommerce/tests/e2e/tests/order/customer-payment-page.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/order/customer-payment-page.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/order/customer-payment-page.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/order/order-bulk-edit.spec.ts b/plugins/woocommerce/tests/e2e/tests/order/order-bulk-edit.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/order/order-bulk-edit.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/order/order-bulk-edit.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/order/order-coupon.spec.ts b/plugins/woocommerce/tests/e2e/tests/order/order-coupon.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/order/order-coupon.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/order/order-coupon.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/order/order-edit.spec.ts b/plugins/woocommerce/tests/e2e/tests/order/order-edit.spec.ts
similarity index 99%
rename from plugins/woocommerce/tests/e2e-pw/tests/order/order-edit.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/order/order-edit.spec.ts
index a737f55a378..f3007bce2e5 100644
--- a/plugins/woocommerce/tests/e2e-pw/tests/order/order-edit.spec.ts
+++ b/plugins/woocommerce/tests/e2e/tests/order/order-edit.spec.ts
@@ -429,7 +429,9 @@ test.describe(
};
test.beforeAll( async () => {
- ( { source_url: downloadFile } = await getMediaBySlug( 'image-01' ) );
+ ( { source_url: downloadFile } = await getMediaBySlug(
+ 'image-01'
+ ) );
} );
test.beforeEach( async ( { restApi } ) => {
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/order/order-grace-period.spec.ts b/plugins/woocommerce/tests/e2e/tests/order/order-grace-period.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/order/order-grace-period.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/order/order-grace-period.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/order/order-refund.spec.ts b/plugins/woocommerce/tests/e2e/tests/order/order-refund.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/order/order-refund.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/order/order-refund.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/order/order-status-filter.spec.ts b/plugins/woocommerce/tests/e2e/tests/order/order-status-filter.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/order/order-status-filter.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/order/order-status-filter.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/order/review-order-page.spec.ts b/plugins/woocommerce/tests/e2e/tests/order/review-order-page.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/order/review-order-page.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/order/review-order-page.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/paypal/paypal.spec.ts b/plugins/woocommerce/tests/e2e/tests/paypal/paypal.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/paypal/paypal.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/paypal/paypal.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/product/create-product-attributes.spec.ts b/plugins/woocommerce/tests/e2e/tests/product/create-product-attributes.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/product/create-product-attributes.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/product/create-product-attributes.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/product/create-variable-product.spec.ts b/plugins/woocommerce/tests/e2e/tests/product/create-variable-product.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/product/create-variable-product.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/product/create-variable-product.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/product/create-variations.spec.ts b/plugins/woocommerce/tests/e2e/tests/product/create-variations.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/product/create-variations.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/product/create-variations.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/product/product-create-simple.spec.ts b/plugins/woocommerce/tests/e2e/tests/product/product-create-simple.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/product/product-create-simple.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/product/product-create-simple.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/product/product-delete.spec.ts b/plugins/woocommerce/tests/e2e/tests/product/product-delete.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/product/product-delete.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/product/product-delete.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/product/product-edit.spec.ts b/plugins/woocommerce/tests/e2e/tests/product/product-edit.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/product/product-edit.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/product/product-edit.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/product/product-export.spec.ts b/plugins/woocommerce/tests/e2e/tests/product/product-export.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/product/product-export.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/product/product-export.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/product/product-grouped.spec.ts b/plugins/woocommerce/tests/e2e/tests/product/product-grouped.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/product/product-grouped.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/product/product-grouped.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/product/product-images.spec.ts b/plugins/woocommerce/tests/e2e/tests/product/product-images.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/product/product-images.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/product/product-images.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/product/product-import-csv.spec.ts b/plugins/woocommerce/tests/e2e/tests/product/product-import-csv.spec.ts
similarity index 98%
rename from plugins/woocommerce/tests/e2e-pw/tests/product/product-import-csv.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/product/product-import-csv.spec.ts
index 364a58ca899..58bc5d771db 100644
--- a/plugins/woocommerce/tests/e2e-pw/tests/product/product-import-csv.spec.ts
+++ b/plugins/woocommerce/tests/e2e/tests/product/product-import-csv.spec.ts
@@ -10,9 +10,9 @@ import { WC_API_PATH } from '@woocommerce/e2e-utils-playwright';
import { test, expect, tags } from '../../fixtures/fixtures';
import { ADMIN_STATE_PATH } from '../../playwright.config';
-const filePath = path.resolve( 'tests/e2e-pw/test-data/sample_products.csv' );
+const filePath = path.resolve( 'tests/e2e/test-data/sample_products.csv' );
const filePathOverride = path.resolve(
- 'tests/e2e-pw/test-data/sample_products_override.csv'
+ 'tests/e2e/test-data/sample_products_override.csv'
);
const productIds: number[] = [];
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/product/product-linked-products.spec.ts b/plugins/woocommerce/tests/e2e/tests/product/product-linked-products.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/product/product-linked-products.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/product/product-linked-products.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/product/product-reviews.spec.ts b/plugins/woocommerce/tests/e2e/tests/product/product-reviews.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/product/product-reviews.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/product/product-reviews.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/product/product-search.spec.ts b/plugins/woocommerce/tests/e2e/tests/product/product-search.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/product/product-search.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/product/product-search.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/product/product-settings.spec.ts b/plugins/woocommerce/tests/e2e/tests/product/product-settings.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/product/product-settings.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/product/product-settings.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/product/product-tags-attributes.spec.ts b/plugins/woocommerce/tests/e2e/tests/product/product-tags-attributes.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/product/product-tags-attributes.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/product/product-tags-attributes.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/product/product-variable.spec.ts b/plugins/woocommerce/tests/e2e/tests/product/product-variable.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/product/product-variable.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/product/product-variable.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/product/update-variations.spec.ts b/plugins/woocommerce/tests/e2e/tests/product/update-variations.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/product/update-variations.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/product/update-variations.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/settings/colour-picker-swatch-height.spec.ts b/plugins/woocommerce/tests/e2e/tests/settings/colour-picker-swatch-height.spec.ts
similarity index 96%
rename from plugins/woocommerce/tests/e2e-pw/tests/settings/colour-picker-swatch-height.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/settings/colour-picker-swatch-height.spec.ts
index 64d7ffd665d..86ecd80317e 100644
--- a/plugins/woocommerce/tests/e2e-pw/tests/settings/colour-picker-swatch-height.spec.ts
+++ b/plugins/woocommerce/tests/e2e/tests/settings/colour-picker-swatch-height.spec.ts
@@ -1,11 +1,7 @@
-/**
- * External dependencies
- */
-import { test, expect } from '../../fixtures/fixtures';
-
/**
* Internal dependencies
*/
+import { test, expect } from '../../fixtures/fixtures';
import { ADMIN_STATE_PATH } from '../../playwright.config';
test.describe( 'Colour picker swatch height on Email settings', () => {
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/settings/consumer-token.spec.ts b/plugins/woocommerce/tests/e2e/tests/settings/consumer-token.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/settings/consumer-token.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/settings/consumer-token.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/settings/settings-general.spec.ts b/plugins/woocommerce/tests/e2e/tests/settings/settings-general.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/settings/settings-general.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/settings/settings-general.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/settings/settings-tax.spec.ts b/plugins/woocommerce/tests/e2e/tests/settings/settings-tax.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/settings/settings-tax.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/settings/settings-tax.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/settings/settings-ui-feature-flag.spec.ts b/plugins/woocommerce/tests/e2e/tests/settings/settings-ui-feature-flag.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/settings/settings-ui-feature-flag.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/settings/settings-ui-feature-flag.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/settings/settings-woo-com.spec.ts b/plugins/woocommerce/tests/e2e/tests/settings/settings-woo-com.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/settings/settings-woo-com.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/settings/settings-woo-com.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/settings/webhooks.spec.ts b/plugins/woocommerce/tests/e2e/tests/settings/webhooks.spec.ts
similarity index 89%
rename from plugins/woocommerce/tests/e2e-pw/tests/settings/webhooks.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/settings/webhooks.spec.ts
index 2b48f15d313..5a627ddbccd 100644
--- a/plugins/woocommerce/tests/e2e-pw/tests/settings/webhooks.spec.ts
+++ b/plugins/woocommerce/tests/e2e/tests/settings/webhooks.spec.ts
@@ -47,10 +47,12 @@ test.describe( 'Manage webhooks', () => {
page.getByRole( 'row', { name: 'Webhook 1' } )
).toBeVisible();
- const editHref = await page
- .getByRole( 'link', { name: 'Webhook 1', exact: true } )
- .getAttribute( 'href' );
- expect( editHref ).toBeTruthy();
+ const editLink = page.getByRole( 'link', {
+ name: 'Webhook 1',
+ exact: true,
+ } );
+ await expect( editLink ).toHaveAttribute( 'href' );
+ const editHref = await editLink.getAttribute( 'href' );
const editURL = new URL( editHref! );
const webhookID = editURL.searchParams.get( 'edit-webhook' );
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/shipping/shipping-classes.spec.ts b/plugins/woocommerce/tests/e2e/tests/shipping/shipping-classes.spec.ts
similarity index 95%
rename from plugins/woocommerce/tests/e2e-pw/tests/shipping/shipping-classes.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/shipping/shipping-classes.spec.ts
index 630508c4d91..8a81b16b2e8 100644
--- a/plugins/woocommerce/tests/e2e-pw/tests/shipping/shipping-classes.spec.ts
+++ b/plugins/woocommerce/tests/e2e/tests/shipping/shipping-classes.spec.ts
@@ -48,6 +48,7 @@ const uq = faker.string.alphanumeric( 5 );
},
} );
+ // eslint-disable-next-line playwright/valid-title -- Title comes from the parametrized test data row.
test( testTitle, { tag: [ tags.SERVICES ] }, async ( { page } ) => {
await page.goto(
'wp-admin/admin.php?page=wc-settings&tab=shipping§ion=classes'
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/shipping/shipping-zones.spec.ts b/plugins/woocommerce/tests/e2e/tests/shipping/shipping-zones.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/shipping/shipping-zones.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/shipping/shipping-zones.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/shop/cart-redirection.spec.ts b/plugins/woocommerce/tests/e2e/tests/shop/cart-redirection.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/shop/cart-redirection.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/shop/cart-redirection.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/shop/shop-search-browse-sort.spec.ts b/plugins/woocommerce/tests/e2e/tests/shop/shop-search-browse-sort.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/shop/shop-search-browse-sort.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/shop/shop-search-browse-sort.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/shop/shop-title-after-deletion.spec.ts b/plugins/woocommerce/tests/e2e/tests/shop/shop-title-after-deletion.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/shop/shop-title-after-deletion.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/shop/shop-title-after-deletion.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/user/lost-password.spec.ts b/plugins/woocommerce/tests/e2e/tests/user/lost-password.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/user/lost-password.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/user/lost-password.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/user/users-create.spec.ts b/plugins/woocommerce/tests/e2e/tests/user/users-create.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/user/users-create.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/user/users-create.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/user/users-manage.spec.ts b/plugins/woocommerce/tests/e2e/tests/user/users-manage.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/user/users-manage.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/user/users-manage.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/wp-core/create-page.spec.ts b/plugins/woocommerce/tests/e2e/tests/wp-core/create-page.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/wp-core/create-page.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/wp-core/create-page.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/wp-core/create-post.spec.ts b/plugins/woocommerce/tests/e2e/tests/wp-core/create-post.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/wp-core/create-post.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/wp-core/create-post.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/wp-core/post-comments.spec.ts b/plugins/woocommerce/tests/e2e/tests/wp-core/post-comments.spec.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tests/wp-core/post-comments.spec.ts
rename to plugins/woocommerce/tests/e2e/tests/wp-core/post-comments.spec.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/emptytheme/block-template-parts/footer.html b/plugins/woocommerce/tests/e2e/themes/blocks/emptytheme/block-template-parts/footer.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/emptytheme/block-template-parts/footer.html
rename to plugins/woocommerce/tests/e2e/themes/blocks/emptytheme/block-template-parts/footer.html
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/emptytheme/block-template-parts/header.html b/plugins/woocommerce/tests/e2e/themes/blocks/emptytheme/block-template-parts/header.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/emptytheme/block-template-parts/header.html
rename to plugins/woocommerce/tests/e2e/themes/blocks/emptytheme/block-template-parts/header.html
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/emptytheme/block-templates/index.html b/plugins/woocommerce/tests/e2e/themes/blocks/emptytheme/block-templates/index.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/emptytheme/block-templates/index.html
rename to plugins/woocommerce/tests/e2e/themes/blocks/emptytheme/block-templates/index.html
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/emptytheme/block-templates/singular.html b/plugins/woocommerce/tests/e2e/themes/blocks/emptytheme/block-templates/singular.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/emptytheme/block-templates/singular.html
rename to plugins/woocommerce/tests/e2e/themes/blocks/emptytheme/block-templates/singular.html
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/emptytheme/functions.php b/plugins/woocommerce/tests/e2e/themes/blocks/emptytheme/functions.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/emptytheme/functions.php
rename to plugins/woocommerce/tests/e2e/themes/blocks/emptytheme/functions.php
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/emptytheme/index.php b/plugins/woocommerce/tests/e2e/themes/blocks/emptytheme/index.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/emptytheme/index.php
rename to plugins/woocommerce/tests/e2e/themes/blocks/emptytheme/index.php
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/emptytheme/screenshot.jpg b/plugins/woocommerce/tests/e2e/themes/blocks/emptytheme/screenshot.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/emptytheme/screenshot.jpg
rename to plugins/woocommerce/tests/e2e/themes/blocks/emptytheme/screenshot.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/emptytheme/style.css b/plugins/woocommerce/tests/e2e/themes/blocks/emptytheme/style.css
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/emptytheme/style.css
rename to plugins/woocommerce/tests/e2e/themes/blocks/emptytheme/style.css
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/emptytheme/styles/variation.json b/plugins/woocommerce/tests/e2e/themes/blocks/emptytheme/styles/variation.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/emptytheme/styles/variation.json
rename to plugins/woocommerce/tests/e2e/themes/blocks/emptytheme/styles/variation.json
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/emptytheme/theme.json b/plugins/woocommerce/tests/e2e/themes/blocks/emptytheme/theme.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/emptytheme/theme.json
rename to plugins/woocommerce/tests/e2e/themes/blocks/emptytheme/theme.json
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__block-notices-filter/functions.php b/plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__block-notices-filter/functions.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__block-notices-filter/functions.php
rename to plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__block-notices-filter/functions.php
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__block-notices-filter/screenshot.jpg b/plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__block-notices-filter/screenshot.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__block-notices-filter/screenshot.jpg
rename to plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__block-notices-filter/screenshot.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__block-notices-filter/style.css b/plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__block-notices-filter/style.css
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__block-notices-filter/style.css
rename to plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__block-notices-filter/style.css
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__block-notices-template/screenshot.jpg b/plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__block-notices-template/screenshot.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__block-notices-template/screenshot.jpg
rename to plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__block-notices-template/screenshot.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__block-notices-template/style.css b/plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__block-notices-template/style.css
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__block-notices-template/style.css
rename to plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__block-notices-template/style.css
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__block-notices-template/woocommerce/notices/error.php b/plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__block-notices-template/woocommerce/notices/error.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__block-notices-template/woocommerce/notices/error.php
rename to plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__block-notices-template/woocommerce/notices/error.php
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__block-notices-template/woocommerce/notices/notice.php b/plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__block-notices-template/woocommerce/notices/notice.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__block-notices-template/woocommerce/notices/notice.php
rename to plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__block-notices-template/woocommerce/notices/notice.php
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__block-notices-template/woocommerce/notices/success.php b/plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__block-notices-template/woocommerce/notices/success.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__block-notices-template/woocommerce/notices/success.php
rename to plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__block-notices-template/woocommerce/notices/success.php
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__classic-notices-template/screenshot.jpg b/plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__classic-notices-template/screenshot.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__classic-notices-template/screenshot.jpg
rename to plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__classic-notices-template/screenshot.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__classic-notices-template/style.css b/plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__classic-notices-template/style.css
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__classic-notices-template/style.css
rename to plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__classic-notices-template/style.css
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__classic-notices-template/woocommerce/notices/error.php b/plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__classic-notices-template/woocommerce/notices/error.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__classic-notices-template/woocommerce/notices/error.php
rename to plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__classic-notices-template/woocommerce/notices/error.php
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__classic-notices-template/woocommerce/notices/notice.php b/plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__classic-notices-template/woocommerce/notices/notice.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__classic-notices-template/woocommerce/notices/notice.php
rename to plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__classic-notices-template/woocommerce/notices/notice.php
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__classic-notices-template/woocommerce/notices/success.php b/plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__classic-notices-template/woocommerce/notices/success.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__classic-notices-template/woocommerce/notices/success.php
rename to plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__classic-notices-template/woocommerce/notices/success.php
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__with-block-template-part-support/functions.php b/plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__with-block-template-part-support/functions.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__with-block-template-part-support/functions.php
rename to plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__with-block-template-part-support/functions.php
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__with-block-template-part-support/style.css b/plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__with-block-template-part-support/style.css
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__with-block-template-part-support/style.css
rename to plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__with-block-template-part-support/style.css
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__with-block-template-part/functions.php b/plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__with-block-template-part/functions.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__with-block-template-part/functions.php
rename to plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__with-block-template-part/functions.php
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__with-block-template-part/parts/mini-cart.html b/plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__with-block-template-part/parts/mini-cart.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__with-block-template-part/parts/mini-cart.html
rename to plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__with-block-template-part/parts/mini-cart.html
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__with-block-template-part/style.css b/plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__with-block-template-part/style.css
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/storefront-child__with-block-template-part/style.css
rename to plugins/woocommerce/tests/e2e/themes/blocks/storefront-child__with-block-template-part/style.css
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-template-parts/external-product-add-to-cart-with-options.html b/plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-template-parts/external-product-add-to-cart-with-options.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-template-parts/external-product-add-to-cart-with-options.html
rename to plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-template-parts/external-product-add-to-cart-with-options.html
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-template-parts/footer.html b/plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-template-parts/footer.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-template-parts/footer.html
rename to plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-template-parts/footer.html
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-template-parts/header.html b/plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-template-parts/header.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-template-parts/header.html
rename to plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-template-parts/header.html
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-template-parts/mini-cart.html b/plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-template-parts/mini-cart.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-template-parts/mini-cart.html
rename to plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-template-parts/mini-cart.html
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-templates/archive-product.html b/plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-templates/archive-product.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-templates/archive-product.html
rename to plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-templates/archive-product.html
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-templates/index.html b/plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-templates/index.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-templates/index.html
rename to plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-templates/index.html
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-templates/order-confirmation.html b/plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-templates/order-confirmation.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-templates/order-confirmation.html
rename to plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-templates/order-confirmation.html
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-templates/page-cart.html b/plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-templates/page-cart.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-templates/page-cart.html
rename to plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-templates/page-cart.html
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-templates/page-checkout.html b/plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-templates/page-checkout.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-templates/page-checkout.html
rename to plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-templates/page-checkout.html
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-templates/product-search-results.html b/plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-templates/product-search-results.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-templates/product-search-results.html
rename to plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-templates/product-search-results.html
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-templates/single-product-belt.html b/plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-templates/single-product-belt.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-templates/single-product-belt.html
rename to plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-templates/single-product-belt.html
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-templates/single-product.html b/plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-templates/single-product.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-templates/single-product.html
rename to plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-templates/single-product.html
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-templates/singular.html b/plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-templates/singular.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-templates/singular.html
rename to plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-templates/singular.html
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-templates/taxonomy-product_attribute.html b/plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-templates/taxonomy-product_attribute.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-templates/taxonomy-product_attribute.html
rename to plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-templates/taxonomy-product_attribute.html
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-templates/taxonomy-product_cat.html b/plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-templates/taxonomy-product_cat.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-templates/taxonomy-product_cat.html
rename to plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-templates/taxonomy-product_cat.html
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-templates/taxonomy-product_tag.html b/plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-templates/taxonomy-product_tag.html
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/block-templates/taxonomy-product_tag.html
rename to plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/block-templates/taxonomy-product_tag.html
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/functions.php b/plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/functions.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/functions.php
rename to plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/functions.php
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/index.php b/plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/index.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/index.php
rename to plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/index.php
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/screenshot.jpg b/plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/screenshot.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/screenshot.jpg
rename to plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/screenshot.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/style.css b/plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/style.css
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/style.css
rename to plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/style.css
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/styles/variation.json b/plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/styles/variation.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/styles/variation.json
rename to plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/styles/variation.json
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/theme.json b/plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/theme.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/theme-with-woo-templates/theme.json
rename to plugins/woocommerce/tests/e2e/themes/blocks/theme-with-woo-templates/theme.json
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/twentytwentyfour-child__block-notices-filter/functions.php b/plugins/woocommerce/tests/e2e/themes/blocks/twentytwentyfour-child__block-notices-filter/functions.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/twentytwentyfour-child__block-notices-filter/functions.php
rename to plugins/woocommerce/tests/e2e/themes/blocks/twentytwentyfour-child__block-notices-filter/functions.php
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/twentytwentyfour-child__block-notices-filter/screenshot.jpg b/plugins/woocommerce/tests/e2e/themes/blocks/twentytwentyfour-child__block-notices-filter/screenshot.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/twentytwentyfour-child__block-notices-filter/screenshot.jpg
rename to plugins/woocommerce/tests/e2e/themes/blocks/twentytwentyfour-child__block-notices-filter/screenshot.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/twentytwentyfour-child__block-notices-filter/style.css b/plugins/woocommerce/tests/e2e/themes/blocks/twentytwentyfour-child__block-notices-filter/style.css
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/twentytwentyfour-child__block-notices-filter/style.css
rename to plugins/woocommerce/tests/e2e/themes/blocks/twentytwentyfour-child__block-notices-filter/style.css
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/twentytwentyfour-child__block-notices-template/screenshot.jpg b/plugins/woocommerce/tests/e2e/themes/blocks/twentytwentyfour-child__block-notices-template/screenshot.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/twentytwentyfour-child__block-notices-template/screenshot.jpg
rename to plugins/woocommerce/tests/e2e/themes/blocks/twentytwentyfour-child__block-notices-template/screenshot.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/twentytwentyfour-child__block-notices-template/style.css b/plugins/woocommerce/tests/e2e/themes/blocks/twentytwentyfour-child__block-notices-template/style.css
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/twentytwentyfour-child__block-notices-template/style.css
rename to plugins/woocommerce/tests/e2e/themes/blocks/twentytwentyfour-child__block-notices-template/style.css
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/twentytwentyfour-child__block-notices-template/woocommerce/notices/error.php b/plugins/woocommerce/tests/e2e/themes/blocks/twentytwentyfour-child__block-notices-template/woocommerce/notices/error.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/twentytwentyfour-child__block-notices-template/woocommerce/notices/error.php
rename to plugins/woocommerce/tests/e2e/themes/blocks/twentytwentyfour-child__block-notices-template/woocommerce/notices/error.php
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/twentytwentyfour-child__block-notices-template/woocommerce/notices/notice.php b/plugins/woocommerce/tests/e2e/themes/blocks/twentytwentyfour-child__block-notices-template/woocommerce/notices/notice.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/twentytwentyfour-child__block-notices-template/woocommerce/notices/notice.php
rename to plugins/woocommerce/tests/e2e/themes/blocks/twentytwentyfour-child__block-notices-template/woocommerce/notices/notice.php
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/twentytwentyfour-child__block-notices-template/woocommerce/notices/success.php b/plugins/woocommerce/tests/e2e/themes/blocks/twentytwentyfour-child__block-notices-template/woocommerce/notices/success.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/twentytwentyfour-child__block-notices-template/woocommerce/notices/success.php
rename to plugins/woocommerce/tests/e2e/themes/blocks/twentytwentyfour-child__block-notices-template/woocommerce/notices/success.php
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/twentytwentyfour-child__classic-notices-template/screenshot.jpg b/plugins/woocommerce/tests/e2e/themes/blocks/twentytwentyfour-child__classic-notices-template/screenshot.jpg
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/twentytwentyfour-child__classic-notices-template/screenshot.jpg
rename to plugins/woocommerce/tests/e2e/themes/blocks/twentytwentyfour-child__classic-notices-template/screenshot.jpg
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/twentytwentyfour-child__classic-notices-template/style.css b/plugins/woocommerce/tests/e2e/themes/blocks/twentytwentyfour-child__classic-notices-template/style.css
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/twentytwentyfour-child__classic-notices-template/style.css
rename to plugins/woocommerce/tests/e2e/themes/blocks/twentytwentyfour-child__classic-notices-template/style.css
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/twentytwentyfour-child__classic-notices-template/woocommerce/notices/error.php b/plugins/woocommerce/tests/e2e/themes/blocks/twentytwentyfour-child__classic-notices-template/woocommerce/notices/error.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/twentytwentyfour-child__classic-notices-template/woocommerce/notices/error.php
rename to plugins/woocommerce/tests/e2e/themes/blocks/twentytwentyfour-child__classic-notices-template/woocommerce/notices/error.php
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/twentytwentyfour-child__classic-notices-template/woocommerce/notices/notice.php b/plugins/woocommerce/tests/e2e/themes/blocks/twentytwentyfour-child__classic-notices-template/woocommerce/notices/notice.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/twentytwentyfour-child__classic-notices-template/woocommerce/notices/notice.php
rename to plugins/woocommerce/tests/e2e/themes/blocks/twentytwentyfour-child__classic-notices-template/woocommerce/notices/notice.php
diff --git a/plugins/woocommerce/tests/e2e-pw/themes/blocks/twentytwentyfour-child__classic-notices-template/woocommerce/notices/success.php b/plugins/woocommerce/tests/e2e/themes/blocks/twentytwentyfour-child__classic-notices-template/woocommerce/notices/success.php
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/themes/blocks/twentytwentyfour-child__classic-notices-template/woocommerce/notices/success.php
rename to plugins/woocommerce/tests/e2e/themes/blocks/twentytwentyfour-child__classic-notices-template/woocommerce/notices/success.php
diff --git a/plugins/woocommerce/tests/e2e-pw/tsconfig.blocks.json b/plugins/woocommerce/tests/e2e/tsconfig.blocks.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tsconfig.blocks.json
rename to plugins/woocommerce/tests/e2e/tsconfig.blocks.json
diff --git a/plugins/woocommerce/tests/e2e-pw/tsconfig.json b/plugins/woocommerce/tests/e2e/tsconfig.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/tsconfig.json
rename to plugins/woocommerce/tests/e2e/tsconfig.json
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/api.ts b/plugins/woocommerce/tests/e2e/utils/api.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/api.ts
rename to plugins/woocommerce/tests/e2e/utils/api.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/blocks/admin/index.ts b/plugins/woocommerce/tests/e2e/utils/blocks/admin/index.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/blocks/admin/index.ts
rename to plugins/woocommerce/tests/e2e/utils/blocks/admin/index.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/blocks/constants.ts b/plugins/woocommerce/tests/e2e/utils/blocks/constants.ts
similarity index 97%
rename from plugins/woocommerce/tests/e2e-pw/utils/blocks/constants.ts
rename to plugins/woocommerce/tests/e2e/utils/blocks/constants.ts
index 670dd560a2f..927cb74d644 100644
--- a/plugins/woocommerce/tests/e2e-pw/utils/blocks/constants.ts
+++ b/plugins/woocommerce/tests/e2e/utils/blocks/constants.ts
@@ -23,7 +23,7 @@ export const BASE_URL =
export const WP_ARTIFACTS_PATH =
process.env.WP_ARTIFACTS_PATH ||
- path.join( process.cwd(), 'tests/e2e-pw/.state' );
+ path.join( process.cwd(), 'tests/e2e/.state' );
export const STORAGE_STATE_PATH =
process.env.STORAGE_STATE_PATH ||
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/blocks/editor/editor-utils.page.ts b/plugins/woocommerce/tests/e2e/utils/blocks/editor/editor-utils.page.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/blocks/editor/editor-utils.page.ts
rename to plugins/woocommerce/tests/e2e/utils/blocks/editor/editor-utils.page.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/blocks/editor/index.ts b/plugins/woocommerce/tests/e2e/utils/blocks/editor/index.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/blocks/editor/index.ts
rename to plugins/woocommerce/tests/e2e/utils/blocks/editor/index.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/blocks/frontend/frontend-utils.page.ts b/plugins/woocommerce/tests/e2e/utils/blocks/frontend/frontend-utils.page.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/blocks/frontend/frontend-utils.page.ts
rename to plugins/woocommerce/tests/e2e/utils/blocks/frontend/frontend-utils.page.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/blocks/frontend/index.ts b/plugins/woocommerce/tests/e2e/utils/blocks/frontend/index.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/blocks/frontend/index.ts
rename to plugins/woocommerce/tests/e2e/utils/blocks/frontend/index.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/blocks/get-test-translation.js b/plugins/woocommerce/tests/e2e/utils/blocks/get-test-translation.js
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/blocks/get-test-translation.js
rename to plugins/woocommerce/tests/e2e/utils/blocks/get-test-translation.js
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/blocks/index.ts b/plugins/woocommerce/tests/e2e/utils/blocks/index.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/blocks/index.ts
rename to plugins/woocommerce/tests/e2e/utils/blocks/index.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/blocks/local-pickup/index.ts b/plugins/woocommerce/tests/e2e/utils/blocks/local-pickup/index.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/blocks/local-pickup/index.ts
rename to plugins/woocommerce/tests/e2e/utils/blocks/local-pickup/index.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/blocks/local-pickup/local-pickup-utils.page.ts b/plugins/woocommerce/tests/e2e/utils/blocks/local-pickup/local-pickup-utils.page.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/blocks/local-pickup/local-pickup-utils.page.ts
rename to plugins/woocommerce/tests/e2e/utils/blocks/local-pickup/local-pickup-utils.page.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/blocks/mini-cart/index.ts b/plugins/woocommerce/tests/e2e/utils/blocks/mini-cart/index.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/blocks/mini-cart/index.ts
rename to plugins/woocommerce/tests/e2e/utils/blocks/mini-cart/index.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/blocks/mini-cart/mini-cart-utils.page.ts b/plugins/woocommerce/tests/e2e/utils/blocks/mini-cart/mini-cart-utils.page.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/blocks/mini-cart/mini-cart-utils.page.ts
rename to plugins/woocommerce/tests/e2e/utils/blocks/mini-cart/mini-cart-utils.page.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/blocks/navigation/navigation.ts b/plugins/woocommerce/tests/e2e/utils/blocks/navigation/navigation.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/blocks/navigation/navigation.ts
rename to plugins/woocommerce/tests/e2e/utils/blocks/navigation/navigation.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/blocks/performance/index.ts b/plugins/woocommerce/tests/e2e/utils/blocks/performance/index.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/blocks/performance/index.ts
rename to plugins/woocommerce/tests/e2e/utils/blocks/performance/index.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/blocks/performance/performance-utils.page.ts b/plugins/woocommerce/tests/e2e/utils/blocks/performance/performance-utils.page.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/blocks/performance/performance-utils.page.ts
rename to plugins/woocommerce/tests/e2e/utils/blocks/performance/performance-utils.page.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/blocks/performance/reports/e2e-cart-performance.json b/plugins/woocommerce/tests/e2e/utils/blocks/performance/reports/e2e-cart-performance.json
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/blocks/performance/reports/e2e-cart-performance.json
rename to plugins/woocommerce/tests/e2e/utils/blocks/performance/reports/e2e-cart-performance.json
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/blocks/request-utils/feature-flag.ts b/plugins/woocommerce/tests/e2e/utils/blocks/request-utils/feature-flag.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/blocks/request-utils/feature-flag.ts
rename to plugins/woocommerce/tests/e2e/utils/blocks/request-utils/feature-flag.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/blocks/request-utils/index.ts b/plugins/woocommerce/tests/e2e/utils/blocks/request-utils/index.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/blocks/request-utils/index.ts
rename to plugins/woocommerce/tests/e2e/utils/blocks/request-utils/index.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/blocks/request-utils/posts.ts b/plugins/woocommerce/tests/e2e/utils/blocks/request-utils/posts.ts
similarity index 96%
rename from plugins/woocommerce/tests/e2e-pw/utils/blocks/request-utils/posts.ts
rename to plugins/woocommerce/tests/e2e/utils/blocks/request-utils/posts.ts
index 3dca50f3c19..5efe090ef6c 100644
--- a/plugins/woocommerce/tests/e2e-pw/utils/blocks/request-utils/posts.ts
+++ b/plugins/woocommerce/tests/e2e/utils/blocks/request-utils/posts.ts
@@ -17,7 +17,7 @@ export interface PostCompiler {
/**
* Creates a post from a Handlebars template file located in the
- * tests/e2e-pw/content-templates/blocks directory.
+ * tests/e2e/content-templates/blocks directory.
*/
export async function createPostFromFile( this: RequestUtils, name: string ) {
const filePrefix = 'post';
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/blocks/request-utils/templates.ts b/plugins/woocommerce/tests/e2e/utils/blocks/request-utils/templates.ts
similarity index 97%
rename from plugins/woocommerce/tests/e2e-pw/utils/blocks/request-utils/templates.ts
rename to plugins/woocommerce/tests/e2e/utils/blocks/request-utils/templates.ts
index c13e6a21ef2..c8c272fd19a 100644
--- a/plugins/woocommerce/tests/e2e-pw/utils/blocks/request-utils/templates.ts
+++ b/plugins/woocommerce/tests/e2e/utils/blocks/request-utils/templates.ts
@@ -62,7 +62,7 @@ export async function revertTemplate( this: RequestUtils, slug: string ) {
/**
* Creates a WP template from a Handlebars template file located in the
- * tests/e2e-pw/content-templates/blocks directory.
+ * tests/e2e/content-templates/blocks directory.
*/
export async function createTemplateFromFile(
this: RequestUtils,
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/blocks/shipping/index.ts b/plugins/woocommerce/tests/e2e/utils/blocks/shipping/index.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/blocks/shipping/index.ts
rename to plugins/woocommerce/tests/e2e/utils/blocks/shipping/index.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/blocks/shipping/shipping-utils.page.ts b/plugins/woocommerce/tests/e2e/utils/blocks/shipping/shipping-utils.page.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/blocks/shipping/shipping-utils.page.ts
rename to plugins/woocommerce/tests/e2e/utils/blocks/shipping/shipping-utils.page.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/blocks/test.ts b/plugins/woocommerce/tests/e2e/utils/blocks/test.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/blocks/test.ts
rename to plugins/woocommerce/tests/e2e/utils/blocks/test.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/blocks/types.ts b/plugins/woocommerce/tests/e2e/utils/blocks/types.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/blocks/types.ts
rename to plugins/woocommerce/tests/e2e/utils/blocks/types.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/blocks/wp-cli.ts b/plugins/woocommerce/tests/e2e/utils/blocks/wp-cli.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/blocks/wp-cli.ts
rename to plugins/woocommerce/tests/e2e/utils/blocks/wp-cli.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/cart.ts b/plugins/woocommerce/tests/e2e/utils/cart.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/cart.ts
rename to plugins/woocommerce/tests/e2e/utils/cart.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/cli.ts b/plugins/woocommerce/tests/e2e/utils/cli.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/cli.ts
rename to plugins/woocommerce/tests/e2e/utils/cli.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/coming-soon.ts b/plugins/woocommerce/tests/e2e/utils/coming-soon.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/coming-soon.ts
rename to plugins/woocommerce/tests/e2e/utils/coming-soon.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/data.ts b/plugins/woocommerce/tests/e2e/utils/data.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/data.ts
rename to plugins/woocommerce/tests/e2e/utils/data.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/editor.ts b/plugins/woocommerce/tests/e2e/utils/editor.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/editor.ts
rename to plugins/woocommerce/tests/e2e/utils/editor.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/email.ts b/plugins/woocommerce/tests/e2e/utils/email.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/email.ts
rename to plugins/woocommerce/tests/e2e/utils/email.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/features.ts b/plugins/woocommerce/tests/e2e/utils/features.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/features.ts
rename to plugins/woocommerce/tests/e2e/utils/features.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/filters.ts b/plugins/woocommerce/tests/e2e/utils/filters.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/filters.ts
rename to plugins/woocommerce/tests/e2e/utils/filters.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/helpers.ts b/plugins/woocommerce/tests/e2e/utils/helpers.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/helpers.ts
rename to plugins/woocommerce/tests/e2e/utils/helpers.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/index.ts b/plugins/woocommerce/tests/e2e/utils/index.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/index.ts
rename to plugins/woocommerce/tests/e2e/utils/index.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/login.ts b/plugins/woocommerce/tests/e2e/utils/login.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/login.ts
rename to plugins/woocommerce/tests/e2e/utils/login.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/media.ts b/plugins/woocommerce/tests/e2e/utils/media.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/media.ts
rename to plugins/woocommerce/tests/e2e/utils/media.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/onboarding.ts b/plugins/woocommerce/tests/e2e/utils/onboarding.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/onboarding.ts
rename to plugins/woocommerce/tests/e2e/utils/onboarding.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/options.ts b/plugins/woocommerce/tests/e2e/utils/options.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/options.ts
rename to plugins/woocommerce/tests/e2e/utils/options.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/pages.ts b/plugins/woocommerce/tests/e2e/utils/pages.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/pages.ts
rename to plugins/woocommerce/tests/e2e/utils/pages.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/payments-settings.ts b/plugins/woocommerce/tests/e2e/utils/payments-settings.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/payments-settings.ts
rename to plugins/woocommerce/tests/e2e/utils/payments-settings.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/pdp.ts b/plugins/woocommerce/tests/e2e/utils/pdp.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/pdp.ts
rename to plugins/woocommerce/tests/e2e/utils/pdp.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/plugin-utils.ts b/plugins/woocommerce/tests/e2e/utils/plugin-utils.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/plugin-utils.ts
rename to plugins/woocommerce/tests/e2e/utils/plugin-utils.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/product-block-editor.ts b/plugins/woocommerce/tests/e2e/utils/product-block-editor.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/product-block-editor.ts
rename to plugins/woocommerce/tests/e2e/utils/product-block-editor.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/settings.ts b/plugins/woocommerce/tests/e2e/utils/settings.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/settings.ts
rename to plugins/woocommerce/tests/e2e/utils/settings.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/simple-products.ts b/plugins/woocommerce/tests/e2e/utils/simple-products.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/simple-products.ts
rename to plugins/woocommerce/tests/e2e/utils/simple-products.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/themes.ts b/plugins/woocommerce/tests/e2e/utils/themes.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/themes.ts
rename to plugins/woocommerce/tests/e2e/utils/themes.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/tours.ts b/plugins/woocommerce/tests/e2e/utils/tours.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/tours.ts
rename to plugins/woocommerce/tests/e2e/utils/tours.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/variable-products.ts b/plugins/woocommerce/tests/e2e/utils/variable-products.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/variable-products.ts
rename to plugins/woocommerce/tests/e2e/utils/variable-products.ts
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/wordpress.ts b/plugins/woocommerce/tests/e2e/utils/wordpress.ts
similarity index 100%
rename from plugins/woocommerce/tests/e2e-pw/utils/wordpress.ts
rename to plugins/woocommerce/tests/e2e/utils/wordpress.ts
diff --git a/tools/monorepo-utils/src/ci-jobs/lib/__tests__/file-changes.spec.ts b/tools/monorepo-utils/src/ci-jobs/lib/__tests__/file-changes.spec.ts
index 592576646e6..a3759842378 100644
--- a/tools/monorepo-utils/src/ci-jobs/lib/__tests__/file-changes.spec.ts
+++ b/tools/monorepo-utils/src/ci-jobs/lib/__tests__/file-changes.spec.ts
@@ -111,7 +111,7 @@ baz/project-d/baz.js`;
jest.mocked( execSync ).mockImplementation( ( command ) => {
if ( command === 'git diff --name-only origin/trunk' ) {
return `plugins/woocommerce/changelog/fix-123
-plugins/woocommerce/tests/e2e-pw/tests/blocks/test.spec.ts
+plugins/woocommerce/tests/e2e/tests/blocks/test.spec.ts
plugins/woocommerce/client/blocks/src/block.tsx`;
}
@@ -128,7 +128,7 @@ plugins/woocommerce/client/blocks/src/block.tsx`;
type: JobType.Test,
testType: 'e2e',
name: 'Blocks e2e tests',
- changes: [ /^tests\/e2e-pw\/tests\/blocks\/.*/ ],
+ changes: [ /^tests\/e2e\/tests\/blocks\/.*/ ],
command: 'test:e2e:blocks',
events: [ 'pull_request' ],
shardingArguments: [],
@@ -155,7 +155,7 @@ plugins/woocommerce/client/blocks/src/block.tsx`;
expect( fileChanges ).toMatchObject( {
'@woocommerce/plugin-woocommerce': [
'changelog/fix-123',
- 'tests/e2e-pw/tests/blocks/test.spec.ts',
+ 'tests/e2e/tests/blocks/test.spec.ts',
],
'@woocommerce/block-library': [ 'src/block.tsx' ],
} );
@@ -182,7 +182,7 @@ plugins/woocommerce/client/blocks/assets/style.scss`;
type: JobType.Test,
testType: 'e2e',
name: 'Blocks e2e tests',
- changes: [ /^tests\/e2e-pw\/tests\/blocks\/.*/ ],
+ changes: [ /^tests\/e2e\/tests\/blocks\/.*/ ],
command: 'test:e2e:blocks',
events: [ 'pull_request' ],
shardingArguments: [],
@@ -219,7 +219,7 @@ plugins/woocommerce/client/blocks/assets/style.scss`;
it( 'should handle multiple CI config patterns from different jobs', () => {
jest.mocked( execSync ).mockImplementation( ( command ) => {
if ( command === 'git diff --name-only origin/trunk' ) {
- return `plugins/woocommerce/tests/e2e-pw/tests/blocks/test.spec.ts
+ return `plugins/woocommerce/tests/e2e/tests/blocks/test.spec.ts
plugins/woocommerce/client/blocks/tests/unit/test.spec.ts
plugins/woocommerce/client/blocks/src/block.tsx`;
}
@@ -237,7 +237,7 @@ plugins/woocommerce/client/blocks/src/block.tsx`;
type: JobType.Test,
testType: 'e2e',
name: 'Blocks e2e tests',
- changes: [ /^tests\/e2e-pw\/tests\/blocks\/.*/ ],
+ changes: [ /^tests\/e2e\/tests\/blocks\/.*/ ],
command: 'test:e2e:blocks',
events: [ 'pull_request' ],
shardingArguments: [],
@@ -270,7 +270,7 @@ plugins/woocommerce/client/blocks/src/block.tsx`;
if ( fileChanges !== true ) {
expect( fileChanges ).toMatchObject( {
'@woocommerce/plugin-woocommerce': [
- 'tests/e2e-pw/tests/blocks/test.spec.ts',
+ 'tests/e2e/tests/blocks/test.spec.ts',
'client/blocks/tests/unit/test.spec.ts',
],
'@woocommerce/block-library': [