Commit cee60c6f8e2 for woocommerce
commit cee60c6f8e2a91fb693a6120bd6d3d511a63dcdf
Author: theAverageDev (Luca Tumedei) <luca.tumedei@automattic.com>
Date: Fri Jun 12 21:01:58 2026 +0200
Migrate Blocks e2e specs into Core e2e suite (#65670)
* Move Blocks e2e specs into Core e2e suite under tests/blocks
* Repoint blocks e2e suite and isolate moved specs from core e2e
* Add changelog entry for blocks e2e spec migration
* Trigger Blocks e2e CI on migrated blocks paths and fix perf config
diff --git a/plugins/woocommerce/changelog/qao-404-blocks-e2e-specs-core-isolation-guard b/plugins/woocommerce/changelog/qao-404-blocks-e2e-specs-core-isolation-guard
new file mode 100644
index 00000000000..81eec0d1b6f
--- /dev/null
+++ b/plugins/woocommerce/changelog/qao-404-blocks-e2e-specs-core-isolation-guard
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Migrate Blocks e2e specs into the Core e2e suite under tests/blocks and add a core testIgnore guard so the core e2e project does not collect them; the Blocks suite keeps running them from the new location. Test-only, no changes to shipped code.
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/bin/generate-test-translations.js b/plugins/woocommerce/client/blocks/tests/e2e/bin/generate-test-translations.js
index 7655e7dd5c5..eb3fe9dcb3b 100644
--- a/plugins/woocommerce/client/blocks/tests/e2e/bin/generate-test-translations.js
+++ b/plugins/woocommerce/client/blocks/tests/e2e/bin/generate-test-translations.js
@@ -9,7 +9,10 @@ const { getTestTranslation } = require( '../utils/get-test-translation.js' );
const ROOT_DIR = path.resolve( __dirname, '../../../../../' );
const BUILD_DIR = path.resolve( ROOT_DIR, 'assets/client/blocks/' );
-const TESTS_DIR = path.resolve( __dirname, '../tests/' );
+const TESTS_DIR = path.resolve(
+ __dirname,
+ '../../../../../tests/e2e-pw/tests/blocks'
+);
const LANGUAGES_DIR = path.join( ROOT_DIR, 'i18n/languages/' );
ensureDirSync( LANGUAGES_DIR );
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/playwright.config.ts b/plugins/woocommerce/client/blocks/tests/e2e/playwright.config.ts
index 2b2a0b10abd..68925a8ff69 100644
--- a/plugins/woocommerce/client/blocks/tests/e2e/playwright.config.ts
+++ b/plugins/woocommerce/client/blocks/tests/e2e/playwright.config.ts
@@ -14,7 +14,8 @@ const config: PlaywrightTestConfig = {
globalSetup: fileURLToPath(
new URL( 'global-setup.ts', 'file:' + __filename ).href
),
- testDir: './tests',
+ /* Specs moved to the Core e2e suite as part of the Blocks/Core e2e merge; the core `e2e` project ignores them via testIgnore. */
+ testDir: '../../../../tests/e2e-pw/tests/blocks',
retries: CI ? 1 : 0,
workers: 1,
reportSlowTests: { max: 5, threshold: 30 * 1000 }, // 30 seconds threshold
@@ -75,10 +76,10 @@ const config: PlaywrightTestConfig = {
{
name: 'legacy-mini-cart',
testMatch: [
- '**/tests/mini-cart/**/*.spec.ts',
- '**/tests/add-to-cart-with-options/**/*.spec.ts',
- '**/tests/product-button/**/*.spec.ts',
- '**/tests/product-collection/**/*.spec.ts',
+ '**/blocks/mini-cart/**/*.spec.ts',
+ '**/blocks/add-to-cart-with-options/**/*.spec.ts',
+ '**/blocks/product-button/**/*.spec.ts',
+ '**/blocks/product-collection/**/*.spec.ts',
],
fullyParallel: true,
use: { ...devices[ 'Desktop Chrome' ] },
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/playwright.performance.config.ts b/plugins/woocommerce/client/blocks/tests/e2e/playwright.performance.config.ts
index b7db4d75e0d..9ff50cfdc51 100644
--- a/plugins/woocommerce/client/blocks/tests/e2e/playwright.performance.config.ts
+++ b/plugins/woocommerce/client/blocks/tests/e2e/playwright.performance.config.ts
@@ -13,8 +13,9 @@ const config: PlaywrightTestConfig = {
projects: [
{
name: 'chromium',
- testDir: '.',
- testMatch: '*.perf.ts',
+ // testDir is inherited from the base config, which points at the
+ // migrated specs under tests/e2e-pw/tests/blocks.
+ testMatch: '**/*.perf.ts',
},
],
};
diff --git a/plugins/woocommerce/package.json b/plugins/woocommerce/package.json
index c4009469ade..eff3017c210 100644
--- a/plugins/woocommerce/package.json
+++ b/plugins/woocommerce/package.json
@@ -732,7 +732,14 @@
"includes/**/*.php",
"src/Blocks/**/*.php",
"templates/**/*.php",
- "templates/**/*.html"
+ "templates/**/*.html",
+ "client/blocks/tests/e2e/**",
+ "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/**"
],
"onlyForDependencies": [
"@woocommerce/block-library"
@@ -766,7 +773,14 @@
"includes/**/*.php",
"src/Blocks/**/*.php",
"templates/**/*.php",
- "templates/**/*.html"
+ "templates/**/*.html",
+ "client/blocks/tests/e2e/**",
+ "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/**"
],
"onlyForDependencies": [
"@woocommerce/block-library"
@@ -802,7 +816,13 @@
"--shard=10/10"
],
"changes": [
- "client/blocks/tests/e2e/**"
+ "client/blocks/tests/e2e/**",
+ "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/**"
],
"onlyForDependencies": [],
"testEnv": {
@@ -840,7 +860,13 @@
"--shard=10/10"
],
"changes": [
- "client/blocks/tests/e2e/**"
+ "client/blocks/tests/e2e/**",
+ "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/**"
],
"onlyForDependencies": [],
"testEnv": {
diff --git a/plugins/woocommerce/tests/e2e-pw/playwright.config.ts b/plugins/woocommerce/tests/e2e-pw/playwright.config.ts
index 38111457e82..5e49e48f6e9 100644
--- a/plugins/woocommerce/tests/e2e-pw/playwright.config.ts
+++ b/plugins/woocommerce/tests/e2e-pw/playwright.config.ts
@@ -135,6 +135,8 @@ export default defineConfig( {
'**/api-tests/**',
/* Exclude PayPal tests, as they don't run well in parallel - see https://github.com/woocommerce/woocommerce/pull/63068. */
'**/tests/paypal/**',
+ /* Blocks specs are run by the Blocks e2e suite - see client/blocks/tests/e2e/playwright.config.ts. */
+ '**/tests/blocks/**',
],
dependencies: [ 'site setup' ],
},
@@ -146,6 +148,7 @@ export default defineConfig( {
{
name: 'legacy-mini-cart',
testMatch: [ '**/tests/cart/**', '**/tests/checkout/**' ],
+ testIgnore: [ '**/tests/blocks/**' ],
dependencies: [ 'site setup' ],
},
{
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/accordion/accordion.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/accordion/accordion.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/accordion/accordion.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/accordion/accordion.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/accordion/accordion.page.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/accordion/accordion.page.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/accordion/accordion.page.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/accordion/accordion.page.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/add-to-cart-form/add-to-cart-form.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/add-to-cart-form/add-to-cart-form.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/add-to-cart-form/add-to-cart-form.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/add-to-cart-form/add-to-cart-form.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/add-to-cart-with-options/add-to-cart-with-options.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/add-to-cart-with-options/add-to-cart-with-options.block_theme.spec.ts
similarity index 99%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/add-to-cart-with-options/add-to-cart-with-options.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/add-to-cart-with-options/add-to-cart-with-options.block_theme.spec.ts
index 57f2c992338..e8ac0c326cc 100644
--- a/plugins/woocommerce/client/blocks/tests/e2e/tests/add-to-cart-with-options/add-to-cart-with-options.block_theme.spec.ts
+++ b/plugins/woocommerce/tests/e2e-pw/tests/blocks/add-to-cart-with-options/add-to-cart-with-options.block_theme.spec.ts
@@ -8,7 +8,7 @@ import { test as base, expect, wpCLI } from '@woocommerce/e2e-utils';
*/
import AddToCartWithOptionsPage from './add-to-cart-with-options.page';
import { ProductGalleryPage } from '../product-gallery/product-gallery.page';
-import config from '../../../../../admin/config/core.json';
+import config from '../../../../../client/admin/config/core.json';
const test = base.extend< {
pageObject: AddToCartWithOptionsPage;
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/add-to-cart-with-options/add-to-cart-with-options.block_theme_with_templates.spec.ts b/plugins/woocommerce/tests/e2e-pw/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/client/blocks/tests/e2e/tests/add-to-cart-with-options/add-to-cart-with-options.block_theme_with_templates.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/add-to-cart-with-options/add-to-cart-with-options.block_theme_with_templates.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/add-to-cart-with-options/add-to-cart-with-options.page.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/add-to-cart-with-options/add-to-cart-with-options.page.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/add-to-cart-with-options/add-to-cart-with-options.page.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/add-to-cart-with-options/add-to-cart-with-options.page.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/all-products/all-products.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/all-products/all-products.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/all-products/all-products.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/all-products/all-products.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/all-reviews/all-reviews.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/all-reviews/all-reviews.block_theme.spec.ts
similarity index 97%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/all-reviews/all-reviews.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/all-reviews/all-reviews.block_theme.spec.ts
index 36baf04275a..8d76c2a5d3d 100644
--- a/plugins/woocommerce/client/blocks/tests/e2e/tests/all-reviews/all-reviews.block_theme.spec.ts
+++ b/plugins/woocommerce/tests/e2e-pw/tests/blocks/all-reviews/all-reviews.block_theme.spec.ts
@@ -6,7 +6,7 @@ import { expect, test } from '@woocommerce/e2e-utils';
/**
* Internal dependencies
*/
-import { allReviews } from '../../test-data/data/data';
+import { allReviews } from '../../../test-data/blocks/data/data';
const BLOCK_NAME = 'woocommerce/all-reviews';
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/attributes-filter/attribute-filter.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/attributes-filter/attribute-filter.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/attributes-filter/attribute-filter.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/attributes-filter/attribute-filter.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/attributes-filter/filter-products-by-attributes-count.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/attributes-filter/filter-products-by-attributes-count.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/attributes-filter/filter-products-by-attributes-count.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/attributes-filter/filter-products-by-attributes-count.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/basic.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/basic.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/basic.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/basic.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/breadcrumbs/breadcrumbs.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/breadcrumbs/breadcrumbs.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/breadcrumbs/breadcrumbs.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/breadcrumbs/breadcrumbs.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/cart/cart-block.merchant.classic_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-block.merchant.classic_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/cart/cart-block.merchant.classic_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-block.merchant.classic_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/cart/cart-block.perf.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-block.perf.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/cart/cart-block.perf.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-block.perf.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/cart/cart-block.shopper.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-block.shopper.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/cart/cart-block.shopper.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-block.shopper.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/cart/cart-checkout-block-coupons.shopper.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-coupons.shopper.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/cart/cart-checkout-block-coupons.shopper.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-coupons.shopper.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/cart/cart-checkout-block-extension-callbacks.shopper.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-extension-callbacks.shopper.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/cart/cart-checkout-block-extension-callbacks.shopper.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-extension-callbacks.shopper.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/cart/cart-checkout-block-notices.shopper.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-notices.shopper.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/cart/cart-checkout-block-notices.shopper.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-notices.shopper.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/cart/cart-checkout-block-notices.shopper.classic_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-notices.shopper.classic_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/cart/cart-checkout-block-notices.shopper.classic_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-notices.shopper.classic_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/cart/cart-checkout-block-shipping.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-shipping.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/cart/cart-checkout-block-shipping.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-shipping.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/cart/cart-checkout-block-taxes.shopper.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-taxes.shopper.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/cart/cart-checkout-block-taxes.shopper.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-taxes.shopper.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/cart/cart-checkout-block-translations.shopper.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-translations.shopper.block_theme.spec.ts
similarity index 95%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/cart/cart-checkout-block-translations.shopper.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-translations.shopper.block_theme.spec.ts
index 1133d7264c3..7f179333e8c 100644
--- a/plugins/woocommerce/client/blocks/tests/e2e/tests/cart/cart-checkout-block-translations.shopper.block_theme.spec.ts
+++ b/plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-checkout-block-translations.shopper.block_theme.spec.ts
@@ -8,8 +8,8 @@ import { expect, test as base, wpCLI } from '@woocommerce/e2e-utils';
*/
import { SIMPLE_PHYSICAL_PRODUCT_NAME } from '../checkout/constants';
import { CheckoutPage } from '../checkout/checkout.page';
-import { translations } from '../../test-data/data/data';
-import { getTestTranslation } from '../../utils/get-test-translation';
+import { translations } from '../../../test-data/blocks/data/data';
+import { getTestTranslation } from '../../../utils/blocks/get-test-translation';
const test = base.extend< { checkoutPageObject: CheckoutPage } >( {
checkoutPageObject: async ( { page }, use ) => {
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/cart/cart-store.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-store.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/cart/cart-store.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart-store.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/cart/cart.page.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart.page.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/cart/cart.page.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/cart/cart.page.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/catalog-sorting/catalog-sorting.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/catalog-sorting/catalog-sorting.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/catalog-sorting/catalog-sorting.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/catalog-sorting/catalog-sorting.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/checkout/additional-fields.guest-shopper.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/additional-fields.guest-shopper.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/checkout/additional-fields.guest-shopper.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/additional-fields.guest-shopper.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/checkout/additional-fields.merchant.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/additional-fields.merchant.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/checkout/additional-fields.merchant.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/additional-fields.merchant.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/checkout/additional-fields.shopper.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/additional-fields.shopper.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/checkout/additional-fields.shopper.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/additional-fields.shopper.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/checkout/checkout-block-custom-place-order-button.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout-block-custom-place-order-button.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/checkout/checkout-block-custom-place-order-button.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout-block-custom-place-order-button.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/checkout/checkout-block-extensibility.shopper.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout-block-extensibility.shopper.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/checkout/checkout-block-extensibility.shopper.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout-block-extensibility.shopper.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/checkout/checkout-block-locale-hide-country.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout-block-locale-hide-country.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/checkout/checkout-block-locale-hide-country.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout-block-locale-hide-country.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/checkout/checkout-block.merchant.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout-block.merchant.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/checkout/checkout-block.merchant.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout-block.merchant.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/checkout/checkout-block.merchant.classic_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout-block.merchant.classic_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/checkout/checkout-block.merchant.classic_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout-block.merchant.classic_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/checkout/checkout-block.shopper.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout-block.shopper.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/checkout/checkout-block.shopper.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout-block.shopper.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/checkout/checkout.page.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout.page.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/checkout/checkout.page.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/checkout.page.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/checkout/constants.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/constants.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/checkout/constants.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/constants.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/checkout/order-confirmation.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/order-confirmation.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/checkout/order-confirmation.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/checkout/order-confirmation.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/classic-template/classic-template.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/classic-template/classic-template.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/classic-template/classic-template.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/classic-template/classic-template.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/classic-template/utils.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/classic-template/utils.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/classic-template/utils.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/classic-template/utils.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/customer-account/customer-account.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/customer-account/customer-account.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/customer-account/customer-account.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/customer-account/customer-account.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/featured-category/featured-category.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/featured-category/featured-category.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/featured-category/featured-category.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/featured-category/featured-category.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/featured-product/featured-product.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/featured-product/featured-product.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/featured-product/featured-product.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/featured-product/featured-product.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/handpicked-products/handpicked-products.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/handpicked-products/handpicked-products.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/handpicked-products/handpicked-products.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/handpicked-products/handpicked-products.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/local-pickup/local-pickup.merchant.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/local-pickup/local-pickup.merchant.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/local-pickup/local-pickup.merchant.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/local-pickup/local-pickup.merchant.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/mini-cart/mini-cart-block.merchant.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/mini-cart/mini-cart-block.merchant.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/mini-cart/mini-cart-block.merchant.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/mini-cart/mini-cart-block.merchant.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/mini-cart/mini-cart-block.shopper.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/mini-cart/mini-cart-block.shopper.block_theme.spec.ts
similarity index 97%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/mini-cart/mini-cart-block.shopper.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/mini-cart/mini-cart-block.shopper.block_theme.spec.ts
index a12405419be..935284b7fb0 100644
--- a/plugins/woocommerce/client/blocks/tests/e2e/tests/mini-cart/mini-cart-block.shopper.block_theme.spec.ts
+++ b/plugins/woocommerce/tests/e2e-pw/tests/blocks/mini-cart/mini-cart-block.shopper.block_theme.spec.ts
@@ -10,10 +10,10 @@ import {
REGULAR_PRICED_PRODUCT_NAME,
SIMPLE_PHYSICAL_PRODUCT_NAME,
} from '../checkout/constants';
-import { getTestTranslation } from '../../utils/get-test-translation';
-import { translations } from '../../test-data/data/data';
+import { getTestTranslation } from '../../../utils/blocks/get-test-translation';
+import { translations } from '../../../test-data/blocks/data/data';
import ProductCollectionPage from '../product-collection/product-collection.page';
-import config from '../../../../../admin/config/core.json';
+import config from '../../../../../client/admin/config/core.json';
const test = base.extend< { productCollectionPage: ProductCollectionPage } >( {
productCollectionPage: async ( { page, admin, editor }, use ) => {
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/mini-cart/mini-cart.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/mini-cart/mini-cart.block_theme.spec.ts
similarity index 99%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/mini-cart/mini-cart.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/mini-cart/mini-cart.block_theme.spec.ts
index 5af2b1f45b4..5bbddb6add4 100644
--- a/plugins/woocommerce/client/blocks/tests/e2e/tests/mini-cart/mini-cart.block_theme.spec.ts
+++ b/plugins/woocommerce/tests/e2e-pw/tests/blocks/mini-cart/mini-cart.block_theme.spec.ts
@@ -7,7 +7,7 @@ import { test, expect, BlockData, wpCLI } from '@woocommerce/e2e-utils';
* Internal dependencies
*/
import { REGULAR_PRICED_PRODUCT_NAME } from '../checkout/constants';
-import config from '../../../../../admin/config/core.json';
+import config from '../../../../../client/admin/config/core.json';
const blockData: BlockData = {
name: 'Mini-Cart',
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/mini-cart/mini-cart.classic_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/mini-cart/mini-cart.classic_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/mini-cart/mini-cart.classic_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/mini-cart/mini-cart.classic_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/mini-cart/utils.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/mini-cart/utils.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/mini-cart/utils.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/mini-cart/utils.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/mutation-batcher/mutation-batcher.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/mutation-batcher/mutation-batcher.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/mutation-batcher/mutation-batcher.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/mutation-batcher/mutation-batcher.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/on-sale-badge/on-sale-badge-single-product-template.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/on-sale-badge/on-sale-badge-single-product-template.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/on-sale-badge/on-sale-badge-single-product-template.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/on-sale-badge/on-sale-badge-single-product-template.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/page-content-wrapper/page-content-wrapper.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/page-content-wrapper/page-content-wrapper.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/page-content-wrapper/page-content-wrapper.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/page-content-wrapper/page-content-wrapper.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/patterns/add-new-pattern.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/patterns/add-new-pattern.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/patterns/add-new-pattern.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/patterns/add-new-pattern.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/patterns/add-new-pattern.classic_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/patterns/add-new-pattern.classic_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/patterns/add-new-pattern.classic_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/patterns/add-new-pattern.classic_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/patterns/utils.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/patterns/utils.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/patterns/utils.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/patterns/utils.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/price-filter/price-filter.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/price-filter/price-filter.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/price-filter/price-filter.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/price-filter/price-filter.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-best-sellers/product-best-sellers.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-best-sellers/product-best-sellers.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-best-sellers/product-best-sellers.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-best-sellers/product-best-sellers.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-button/product-button.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-button/product-button.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-button/product-button.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-button/product-button.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-button/product-button.classic_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-button/product-button.classic_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-button/product-button.classic_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-button/product-button.classic_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-button/utils.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-button/utils.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-button/utils.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-button/utils.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-categories/product-categories.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-categories/product-categories.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-categories/product-categories.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-categories/product-categories.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-category/product-category.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-category/product-category.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-category/product-category.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-category/product-category.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-collection/collection-pickers.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/collection-pickers.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-collection/collection-pickers.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/collection-pickers.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-collection/collections.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/collections.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-collection/collections.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/collections.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-collection/compatibility-layer.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/compatibility-layer.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-collection/compatibility-layer.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/compatibility-layer.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-collection/extensibility-events.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/extensibility-events.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-collection/extensibility-events.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/extensibility-events.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-collection/inspector-controls.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/inspector-controls.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-collection/inspector-controls.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/inspector-controls.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-collection/product-collection-errors.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/product-collection-errors.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-collection/product-collection-errors.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/product-collection-errors.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-collection/product-collection.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/product-collection.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-collection/product-collection.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/product-collection.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-collection/product-collection.page.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/product-collection.page.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-collection/product-collection.page.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/product-collection.page.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-collection/product-picker.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/product-picker.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-collection/product-picker.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/product-picker.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-collection/register-product-collection.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/register-product-collection.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-collection/register-product-collection.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-collection/register-product-collection.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-filters/active-filter-frontend.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/active-filter-frontend.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-filters/active-filter-frontend.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/active-filter-frontend.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-filters/attribute-filter-editor.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/attribute-filter-editor.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-filters/attribute-filter-editor.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/attribute-filter-editor.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-filters/attribute-filter-frontend.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/attribute-filter-frontend.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-filters/attribute-filter-frontend.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/attribute-filter-frontend.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-filters/price-filter-editor.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/price-filter-editor.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-filters/price-filter-editor.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/price-filter-editor.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-filters/product-filters-frontend.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/product-filters-frontend.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-filters/product-filters-frontend.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/product-filters-frontend.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-filters/product-filters.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/product-filters.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-filters/product-filters.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/product-filters.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-filters/product-filters.page.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/product-filters.page.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-filters/product-filters.page.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/product-filters.page.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-filters/rating-filter-editor.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/rating-filter-editor.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-filters/rating-filter-editor.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/rating-filter-editor.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-filters/removable-chips-editor.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/removable-chips-editor.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-filters/removable-chips-editor.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-filters/removable-chips-editor.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-gallery/inner-blocks/product-gallery-large-image/product-gallery-large-image.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/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/client/blocks/tests/e2e/tests/product-gallery/inner-blocks/product-gallery-large-image/product-gallery-large-image.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-gallery/inner-blocks/product-gallery-large-image/product-gallery-large-image.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-gallery/inner-blocks/product-gallery-thumbnails/product-gallery-thumbnails.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-gallery/inner-blocks/product-gallery-thumbnails/product-gallery-thumbnails.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-gallery/inner-blocks/product-gallery-thumbnails/product-gallery-thumbnails.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-gallery/inner-blocks/product-gallery-thumbnails/product-gallery-thumbnails.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-gallery/product-gallery.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-gallery/product-gallery.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-gallery/product-gallery.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-gallery/product-gallery.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-gallery/product-gallery.page.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-gallery/product-gallery.page.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-gallery/product-gallery.page.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-gallery/product-gallery.page.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-image-gallery/product-image-gallery.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-image-gallery/product-image-gallery.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-image-gallery/product-image-gallery.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-image-gallery/product-image-gallery.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-new/product-new.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-new/product-new.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-new/product-new.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-new/product-new.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-on-sale/product-on-sale.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-on-sale/product-on-sale.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-on-sale/product-on-sale.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-on-sale/product-on-sale.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-results-count/product-results-count.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-results-count/product-results-count.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-results-count/product-results-count.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-results-count/product-results-count.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-tag/product-tag.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-tag/product-tag.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-tag/product-tag.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-tag/product-tag.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/product-top-rated/product-top-rated.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/product-top-rated/product-top-rated.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/product-top-rated/product-top-rated.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/product-top-rated/product-top-rated.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/products-by-attribute/products-by-attribute.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/products-by-attribute/products-by-attribute.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/products-by-attribute/products-by-attribute.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/products-by-attribute/products-by-attribute.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/products/products.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/products/products.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/products/products.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/products/products.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/products/utils.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/products/utils.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/products/utils.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/products/utils.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/rating-filter/rating-filter.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/rating-filter/rating-filter.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/rating-filter/rating-filter.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/rating-filter/rating-filter.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/related-products/related-products.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/related-products/related-products.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/related-products/related-products.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/related-products/related-products.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/reviews-by-category/reviews-by-category.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/reviews-by-category/reviews-by-category.block_theme.spec.ts
similarity index 96%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/reviews-by-category/reviews-by-category.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/reviews-by-category/reviews-by-category.block_theme.spec.ts
index 9885a89970d..53903405bf9 100644
--- a/plugins/woocommerce/client/blocks/tests/e2e/tests/reviews-by-category/reviews-by-category.block_theme.spec.ts
+++ b/plugins/woocommerce/tests/e2e-pw/tests/blocks/reviews-by-category/reviews-by-category.block_theme.spec.ts
@@ -6,7 +6,7 @@ import { expect, test } from '@woocommerce/e2e-utils';
/**
* Internal dependencies
*/
-import { allReviews, hoodieReviews } from '../../test-data/data/data';
+import { allReviews, hoodieReviews } from '../../../test-data/blocks/data/data';
const latestReview = allReviews[ allReviews.length - 1 ];
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/reviews-by-product/reviews-by-product.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/reviews-by-product/reviews-by-product.block_theme.spec.ts
similarity index 96%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/reviews-by-product/reviews-by-product.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/reviews-by-product/reviews-by-product.block_theme.spec.ts
index 67875a09fc9..edbca924d12 100644
--- a/plugins/woocommerce/client/blocks/tests/e2e/tests/reviews-by-product/reviews-by-product.block_theme.spec.ts
+++ b/plugins/woocommerce/tests/e2e-pw/tests/blocks/reviews-by-product/reviews-by-product.block_theme.spec.ts
@@ -6,7 +6,7 @@ import { expect, test } from '@woocommerce/e2e-utils';
/**
* Internal dependencies
*/
-import { allReviews, hoodieReviews } from '../../test-data/data/data';
+import { allReviews, hoodieReviews } from '../../../test-data/blocks/data/data';
const BLOCK_NAME = 'woocommerce/reviews-by-product';
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/single-product-details/single-product-details.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/single-product-details/single-product-details.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/single-product-details/single-product-details.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/single-product-details/single-product-details.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/single-product-template/single-product-template-compatibility-layer.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/single-product-template/single-product-template-compatibility-layer.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/single-product-template/single-product-template-compatibility-layer.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/single-product-template/single-product-template-compatibility-layer.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/single-product-template/single-product-template.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/single-product-template/single-product-template.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/single-product-template/single-product-template.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/single-product-template/single-product-template.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/single-product-template/single-product-template.product-rating.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/single-product-template/single-product-template.product-rating.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/single-product-template/single-product-template.product-rating.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/single-product-template/single-product-template.product-rating.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/single-product/product-rating-single-product.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/single-product/product-rating-single-product.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/single-product/product-rating-single-product.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/single-product/product-rating-single-product.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/stock-filter/stock-filter.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/stock-filter/stock-filter.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/stock-filter/stock-filter.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/stock-filter/stock-filter.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/store-notices/store-notices.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/store-notices/store-notices.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/store-notices/store-notices.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/store-notices/store-notices.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/style.classic_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/style.classic_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/style.classic_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/style.classic_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/templates/cart-template.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/cart-template.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/templates/cart-template.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/cart-template.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/templates/checkout-template.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/checkout-template.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/templates/checkout-template.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/checkout-template.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/templates/constants.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/constants.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/templates/constants.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/constants.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/templates/legacy-templates.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/legacy-templates.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/templates/legacy-templates.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/legacy-templates.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/templates/order-confirmation.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/order-confirmation.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/templates/order-confirmation.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/order-confirmation.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/templates/product-search-results.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/product-search-results.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/templates/product-search-results.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/product-search-results.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/templates/shop-page.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/shop-page.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/templates/shop-page.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/shop-page.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/templates/single-product-template.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/single-product-template.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/templates/single-product-template.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/single-product-template.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/templates/single-product-template.block_theme_with_templates.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/single-product-template.block_theme_with_templates.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/templates/single-product-template.block_theme_with_templates.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/single-product-template.block_theme_with_templates.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/templates/template-customization.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/template-customization.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/templates/template-customization.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/template-customization.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/templates/template-customization.block_theme_with_templates.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/template-customization.block_theme_with_templates.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/templates/template-customization.block_theme_with_templates.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/template-customization.block_theme_with_templates.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/templates/template-part-customization.classic_theme_with_template_parts.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/template-part-customization.classic_theme_with_template_parts.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/templates/template-part-customization.classic_theme_with_template_parts.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/template-part-customization.classic_theme_with_template_parts.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/templates/template-part-customization.classic_theme_with_template_parts_support.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/template-part-customization.classic_theme_with_template_parts_support.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/templates/template-part-customization.classic_theme_with_template_parts_support.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/template-part-customization.classic_theme_with_template_parts_support.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/templates/template-priority.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/template-priority.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/templates/template-priority.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/template-priority.block_theme.spec.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/templates/templates.page.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/templates.page.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/templates/templates.page.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/templates/templates.page.ts
diff --git a/plugins/woocommerce/client/blocks/tests/e2e/tests/utils/register-block-single-product-template.block_theme.spec.ts b/plugins/woocommerce/tests/e2e-pw/tests/blocks/utils/register-block-single-product-template.block_theme.spec.ts
similarity index 100%
rename from plugins/woocommerce/client/blocks/tests/e2e/tests/utils/register-block-single-product-template.block_theme.spec.ts
rename to plugins/woocommerce/tests/e2e-pw/tests/blocks/utils/register-block-single-product-template.block_theme.spec.ts