diff --git a/plugins/woocommerce-blocks/.distignore b/plugins/woocommerce-blocks/.distignore index 80cff3983a2..b802f683f53 100644 --- a/plugins/woocommerce-blocks/.distignore +++ b/plugins/woocommerce-blocks/.distignore @@ -8,6 +8,7 @@ /patches /storybook /tests +/playwright-report .editorconfig .env diff --git a/plugins/woocommerce-blocks/.eslintignore b/plugins/woocommerce-blocks/.eslintignore index 888b56ce67f..b3005136eed 100644 --- a/plugins/woocommerce-blocks/.eslintignore +++ b/plugins/woocommerce-blocks/.eslintignore @@ -7,8 +7,8 @@ node_modules vendor legacy reports -tests/e2e/specs/backend/__fixtures__ -tests/e2e/specs/backend/__snapshots__ +tests/e2e-jest/specs/backend/__fixtures__ +tests/e2e-jest/specs/backend/__snapshots__ storybook/dist assets/js/interactivity diff --git a/plugins/woocommerce-blocks/.github/workflows/php-js-e2e-tests.yml b/plugins/woocommerce-blocks/.github/workflows/php-js-e2e-tests.yml index 258c77647f8..157d3e00244 100644 --- a/plugins/woocommerce-blocks/.github/workflows/php-js-e2e-tests.yml +++ b/plugins/woocommerce-blocks/.github/workflows/php-js-e2e-tests.yml @@ -70,8 +70,8 @@ jobs: run: | node ./bin/wp-env-with-gutenberg.js npm run wp-env start - npm run wp-env:config && npx cross-env NODE_CONFIG_DIR=tests/e2e/config wp-scripts test-e2e --config tests/e2e/config/jest.config.js --listTests > ~/.jest-e2e-tests - npx cross-env JEST_PUPPETEER_CONFIG=tests/e2e/config/jest-puppeteer.config.js cross-env NODE_CONFIG_DIR=tests/e2e/config wp-scripts test-e2e --config tests/e2e/config/jest.config.js --runInBand --runTestsByPath $( awk 'NR % 5 == ${{ matrix.part }} - 1' < ~/.jest-e2e-tests ) + npm run wp-env:config && npx cross-env NODE_CONFIG_DIR=tests/e2e-jest/config wp-scripts test-e2e --config tests/e2e-jest/config/jest.config.js --listTests > ~/.jest-e2e-tests + npx cross-env JEST_PUPPETEER_CONFIG=tests/e2e-jest/config/jest-puppeteer.config.js cross-env NODE_CONFIG_DIR=tests/e2e-jest/config wp-scripts test-e2e --config tests/e2e-jest/config/jest.config.js --runInBand --runTestsByPath $( awk 'NR % 5 == ${{ matrix.part }} - 1' < ~/.jest-e2e-tests ) - name: Upload artifacts on failure if: ${{ failure() }} @@ -154,8 +154,8 @@ jobs: WOOCOMMERCE_BLOCKS_PHASE: 3 run: | npm run wp-env start - npm run wp-env:config && npx cross-env NODE_CONFIG_DIR=tests/e2e/config wp-scripts test-e2e --config tests/e2e/config/jest.config.js --listTests > ~/.jest-e2e-tests - npx cross-env JEST_PUPPETEER_CONFIG=tests/e2e/config/jest-puppeteer.config.js cross-env NODE_CONFIG_DIR=tests/e2e/config wp-scripts test-e2e --config tests/e2e/config/jest.config.js --runInBand --runTestsByPath $( awk 'NR % 5 == ${{ matrix.part }} - 1' < ~/.jest-e2e-tests ) + npm run wp-env:config && npx cross-env NODE_CONFIG_DIR=tests/e2e-jest/config wp-scripts test-e2e --config tests/e2e-jest/config/jest.config.js --listTests > ~/.jest-e2e-tests + npx cross-env JEST_PUPPETEER_CONFIG=tests/e2e-jest/config/jest-puppeteer.config.js cross-env NODE_CONFIG_DIR=tests/e2e-jest/config wp-scripts test-e2e --config tests/e2e-jest/config/jest.config.js --runInBand --runTestsByPath $( awk 'NR % 5 == ${{ matrix.part }} - 1' < ~/.jest-e2e-tests ) - name: Upload artifacts on failure if: ${{ failure() }} diff --git a/plugins/woocommerce-blocks/.github/workflows/playwright.yml b/plugins/woocommerce-blocks/.github/workflows/playwright.yml index b6c53956118..5410fe1e3ae 100644 --- a/plugins/woocommerce-blocks/.github/workflows/playwright.yml +++ b/plugins/woocommerce-blocks/.github/workflows/playwright.yml @@ -57,7 +57,7 @@ jobs: run: npm run env:start - name: Run Playwright tests - run: npm run test:e2e-pw + run: npm run test:e2e - uses: actions/upload-artifact@v3 if: ${{ failure() }} diff --git a/plugins/woocommerce-blocks/.gitignore b/plugins/woocommerce-blocks/.gitignore index 247fab6c397..a4e4804293b 100644 --- a/plugins/woocommerce-blocks/.gitignore +++ b/plugins/woocommerce-blocks/.gitignore @@ -43,9 +43,10 @@ tests/cli/vendor # E2E tests /tests/e2e-tests/config/local-*.json -**/e2e-pw/test-results/ -**/e2e-pw/artifacts/ +**/e2e/test-results/ +**/e2e/artifacts/ /artifacts/ +/playwright-report/ # Logs /logs diff --git a/plugins/woocommerce-blocks/bin/check-env.sh b/plugins/woocommerce-blocks/bin/check-env.sh new file mode 100644 index 00000000000..db6bc79d6c5 --- /dev/null +++ b/plugins/woocommerce-blocks/bin/check-env.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +if ! docker info > /dev/null 2>&1; then + echo "This script uses docker, and it isn't running - please start docker and try again!" + exit 1 +fi + +if ! [ "$(docker ps --filter "name=wordpress" --filter "status=running" --quiet)" ]; then + echo "This script uses wp-env, and it isn't running - please start wp-env and try again!" + exit 1 +fi diff --git a/plugins/woocommerce-blocks/docs/contributors/e2e-guidelines.md b/plugins/woocommerce-blocks/docs/contributors/e2e-guidelines.md index 2aa26ae31b3..1bcc1e46c48 100644 --- a/plugins/woocommerce-blocks/docs/contributors/e2e-guidelines.md +++ b/plugins/woocommerce-blocks/docs/contributors/e2e-guidelines.md @@ -6,13 +6,13 @@ - [Playwright](#playwright) - [Structure](#structure-1) -This living document serves to prescribe coding guidelines specific to the WooCommerce Blocks project E2E tests. For more information on how to run Playwright end-to-end (E2E) tests, please refer to the [dedicated resource](../../tests/e2e-pw/README.md). +This living document serves to prescribe coding guidelines specific to the WooCommerce Blocks project E2E tests. For more information on how to run Playwright end-to-end (E2E) tests, please refer to the [dedicated resource](../../tests/e2e/README.md). ## Structure There are two folders dedicated to E2E tests. -The first folder is named "e2e" and it contains all the E2E tests that were created with the deprecated infrastructure Jest + Puppetter. The "e2e-pw" folder contains all the E2E tests that were created with the current infrastructure: Playwright. These tests are actively maintained and should be used for all new E2E testing. +The first folder is named "e2e-jest" and it contains all the E2E tests that were created with the deprecated infrastructure Jest + Puppetter. The "e2e" folder contains all the E2E tests that were created with the current infrastructure: Playwright. These tests are actively maintained and should be used for all new E2E testing. ### Playwright @@ -20,9 +20,9 @@ The first folder is named "e2e" and it contains all the E2E tests that were crea There are three Playwright projects configuration: -- blockTheme -- blockThemeWithGlobalSideEffects -- classicTheme +- blockTheme +- blockThemeWithGlobalSideEffects +- classicTheme The blockTheme project runs the tests with the suffix _block_theme_. In this case, the theme is a block theme. The block theme is the default WordPress theme. Currently, it is Twenty-Twenty Three. You should use this configuration if you want test the block with the Site Editor. diff --git a/plugins/woocommerce-blocks/docs/contributors/javascript-testing.md b/plugins/woocommerce-blocks/docs/contributors/javascript-testing.md index 6493357eeb2..98dc2d65ba3 100644 --- a/plugins/woocommerce-blocks/docs/contributors/javascript-testing.md +++ b/plugins/woocommerce-blocks/docs/contributors/javascript-testing.md @@ -63,7 +63,7 @@ When you're done, you may want to shut down the test environment: ## How to run end-to-end tests -Visit the [dedicated documentation](../../tests/e2e-pw/README.md). +Visit the [dedicated documentation](../../tests/e2e/README.md). ### Debugging e2e tests using generated reports diff --git a/plugins/woocommerce-blocks/package.json b/plugins/woocommerce-blocks/package.json index fce35f43709..520f4003de3 100644 --- a/plugins/woocommerce-blocks/package.json +++ b/plugins/woocommerce-blocks/package.json @@ -79,16 +79,17 @@ "storybook:deploy": "rimraf ./storybook/dist/* && npm run storybook:build && gh-pages -d ./storybook/dist", "test": "wp-scripts test-unit-js --config tests/js/jest.config.json", "test:debug": "ndb .", - "test:e2e": "npm run wp-env:config && cross-env JEST_PUPPETEER_CONFIG=tests/e2e/config/jest-puppeteer.config.js NODE_CONFIG_DIR=tests/e2e/config wp-scripts test-e2e --config tests/e2e/config/jest.config.js", - "test:e2e-dev": "npm run wp-env:config && cross-env JEST_PUPPETEER_CONFIG=tests/e2e/config/jest-puppeteer.config-dev.js NODE_CONFIG_DIR=tests/e2e/config wp-scripts test-e2e --config tests/e2e/config/jest.config.js", - "test:e2e-dev-watch": "npm run wp-env:config && cross-env JEST_PUPPETEER_CONFIG=tests/e2e/config/jest-puppeteer.config-dev.js NODE_CONFIG_DIR=tests/e2e/config wp-scripts test-e2e --config tests/e2e/config/jest.config.js --watch", - "test:e2e:update": "npm run wp-env:config && cross-env JEST_PUPPETEER_CONFIG=tests/e2e/config/jest-puppeteer.config.js NODE_CONFIG_DIR=tests/e2e/config wp-scripts test-e2e --config tests/e2e/config/jest.config.js --updateSnapshot", - "test:e2e-pw": "npx playwright test --config=tests/e2e-pw/playwright.config.ts", - "env:start": "npm run wp-env start && ./tests/e2e-pw/bin/test-env-setup.sh", - "env:restart": "npm run wp-env clean all && npm run wp-env start && ./tests/e2e-pw/bin/test-env-setup.sh", + "test:e2e": "sh ./bin/check-env.sh && npx playwright test --config=tests/e2e/playwright.config.ts", + "test:e2e:report": "sh ./bin/check-env.sh && npx playwright test --config=tests/e2e/playwright.config.ts --reporter=html", + "test:e2e:jest": "npm run wp-env:config && cross-env JEST_PUPPETEER_CONFIG=tests/e2e-jest/config/jest-puppeteer.config.js NODE_CONFIG_DIR=tests/e2e-jest/config wp-scripts test-e2e --config tests/e2e-jest/config/jest.config.js", + "test:e2e:jest:dev": "npm run wp-env:config && cross-env JEST_PUPPETEER_CONFIG=tests/e2e-jest/config/jest-puppeteer.config-dev.js NODE_CONFIG_DIR=tests/e2e-jest/config wp-scripts test-e2e --config tests/e2e-jest/config/jest.config.js", + "test:e2e:jest:dev-watch": "npm run wp-env:config && cross-env JEST_PUPPETEER_CONFIG=tests/e2e-jest/config/jest-puppeteer.config-dev.js NODE_CONFIG_DIR=tests/e2e-jest/config wp-scripts test-e2e --config tests/e2e-jest/config/jest.config.js --watch", + "test:e2e:jest:update": "npm run wp-env:config && cross-env JEST_PUPPETEER_CONFIG=tests/e2e-jest/config/jest-puppeteer.config.js NODE_CONFIG_DIR=tests/e2e-jest/config wp-scripts test-e2e --config tests/e2e-jest/config/jest.config.js --updateSnapshot", + "env:start": "npm run wp-env start && ./tests/e2e/bin/test-env-setup.sh", + "env:restart": "npm run wp-env clean all && npm run wp-env start && ./tests/e2e/bin/test-env-setup.sh", "env:stop": "npm run wp-env stop", "test:help": "wp-scripts test-unit-js --help", - "test:performance": "npm run wp-env:config && cross-env NODE_CONFIG_DIR=tests/e2e/config wp-scripts test-e2e --config tests/e2e/config/jest.performance.config.js -- performance", + "test:performance": "npm run wp-env:config && cross-env NODE_CONFIG_DIR=tests/e2e-jest/config wp-scripts test-e2e --config tests/e2e-jest/config/jest.performance.config.js -- performance", "test:php": "wp-env run --env-cwd='wp-content/plugins/${PWD##*/}' tests-wordpress vendor/bin/phpunit -c phpunit.xml.dist", "test:update": "wp-scripts test-unit-js --updateSnapshot --config tests/js/jest.config.json", "test:watch": "npm run test -- --watch", diff --git a/plugins/woocommerce-blocks/tests/e2e/config/custom-matchers/__fixtures__/best-selling-products.fixture.json b/plugins/woocommerce-blocks/tests/e2e-jest/config/custom-matchers/__fixtures__/best-selling-products.fixture.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/config/custom-matchers/__fixtures__/best-selling-products.fixture.json rename to plugins/woocommerce-blocks/tests/e2e-jest/config/custom-matchers/__fixtures__/best-selling-products.fixture.json diff --git a/plugins/woocommerce-blocks/tests/e2e/config/custom-matchers/__fixtures__/featured-category.fixture.json b/plugins/woocommerce-blocks/tests/e2e-jest/config/custom-matchers/__fixtures__/featured-category.fixture.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/config/custom-matchers/__fixtures__/featured-category.fixture.json rename to plugins/woocommerce-blocks/tests/e2e-jest/config/custom-matchers/__fixtures__/featured-category.fixture.json diff --git a/plugins/woocommerce-blocks/tests/e2e/config/custom-matchers/__fixtures__/hand-picked-products.fixture.json b/plugins/woocommerce-blocks/tests/e2e-jest/config/custom-matchers/__fixtures__/hand-picked-products.fixture.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/config/custom-matchers/__fixtures__/hand-picked-products.fixture.json rename to plugins/woocommerce-blocks/tests/e2e-jest/config/custom-matchers/__fixtures__/hand-picked-products.fixture.json diff --git a/plugins/woocommerce-blocks/tests/e2e/config/custom-matchers/__fixtures__/newest-products.fixture.json b/plugins/woocommerce-blocks/tests/e2e-jest/config/custom-matchers/__fixtures__/newest-products.fixture.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/config/custom-matchers/__fixtures__/newest-products.fixture.json rename to plugins/woocommerce-blocks/tests/e2e-jest/config/custom-matchers/__fixtures__/newest-products.fixture.json diff --git a/plugins/woocommerce-blocks/tests/e2e/config/custom-matchers/__fixtures__/product-categories-list.fixture.json b/plugins/woocommerce-blocks/tests/e2e-jest/config/custom-matchers/__fixtures__/product-categories-list.fixture.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/config/custom-matchers/__fixtures__/product-categories-list.fixture.json rename to plugins/woocommerce-blocks/tests/e2e-jest/config/custom-matchers/__fixtures__/product-categories-list.fixture.json diff --git a/plugins/woocommerce-blocks/tests/e2e/config/custom-matchers/__fixtures__/single-product-details.fixture.json b/plugins/woocommerce-blocks/tests/e2e-jest/config/custom-matchers/__fixtures__/single-product-details.fixture.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/config/custom-matchers/__fixtures__/single-product-details.fixture.json rename to plugins/woocommerce-blocks/tests/e2e-jest/config/custom-matchers/__fixtures__/single-product-details.fixture.json diff --git a/plugins/woocommerce-blocks/tests/e2e/config/custom-matchers/__fixtures__/top-rated-products.fixture.json b/plugins/woocommerce-blocks/tests/e2e-jest/config/custom-matchers/__fixtures__/top-rated-products.fixture.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/config/custom-matchers/__fixtures__/top-rated-products.fixture.json rename to plugins/woocommerce-blocks/tests/e2e-jest/config/custom-matchers/__fixtures__/top-rated-products.fixture.json diff --git a/plugins/woocommerce-blocks/tests/e2e/config/custom-matchers/index.js b/plugins/woocommerce-blocks/tests/e2e-jest/config/custom-matchers/index.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/config/custom-matchers/index.js rename to plugins/woocommerce-blocks/tests/e2e-jest/config/custom-matchers/index.js diff --git a/plugins/woocommerce-blocks/tests/e2e/config/custom-matchers/to-render-block.js b/plugins/woocommerce-blocks/tests/e2e-jest/config/custom-matchers/to-render-block.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/config/custom-matchers/to-render-block.js rename to plugins/woocommerce-blocks/tests/e2e-jest/config/custom-matchers/to-render-block.js diff --git a/plugins/woocommerce-blocks/tests/e2e/config/custom-matchers/to-toggle-element.js b/plugins/woocommerce-blocks/tests/e2e-jest/config/custom-matchers/to-toggle-element.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/config/custom-matchers/to-toggle-element.js rename to plugins/woocommerce-blocks/tests/e2e-jest/config/custom-matchers/to-toggle-element.js diff --git a/plugins/woocommerce-blocks/tests/e2e/config/custom-matchers/to-toggle-required-attr-of.js b/plugins/woocommerce-blocks/tests/e2e-jest/config/custom-matchers/to-toggle-required-attr-of.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/config/custom-matchers/to-toggle-required-attr-of.js rename to plugins/woocommerce-blocks/tests/e2e-jest/config/custom-matchers/to-toggle-required-attr-of.js diff --git a/plugins/woocommerce-blocks/tests/e2e/config/default.json b/plugins/woocommerce-blocks/tests/e2e-jest/config/default.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/config/default.json rename to plugins/woocommerce-blocks/tests/e2e-jest/config/default.json diff --git a/plugins/woocommerce-blocks/tests/e2e/config/environment.js b/plugins/woocommerce-blocks/tests/e2e-jest/config/environment.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/config/environment.js rename to plugins/woocommerce-blocks/tests/e2e-jest/config/environment.js diff --git a/plugins/woocommerce-blocks/tests/e2e/config/jest-puppeteer.config-dev.js b/plugins/woocommerce-blocks/tests/e2e-jest/config/jest-puppeteer.config-dev.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/config/jest-puppeteer.config-dev.js rename to plugins/woocommerce-blocks/tests/e2e-jest/config/jest-puppeteer.config-dev.js diff --git a/plugins/woocommerce-blocks/tests/e2e/config/jest-puppeteer.config.js b/plugins/woocommerce-blocks/tests/e2e-jest/config/jest-puppeteer.config.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/config/jest-puppeteer.config.js rename to plugins/woocommerce-blocks/tests/e2e-jest/config/jest-puppeteer.config.js diff --git a/plugins/woocommerce-blocks/tests/e2e/config/jest.config.js b/plugins/woocommerce-blocks/tests/e2e-jest/config/jest.config.js similarity index 70% rename from plugins/woocommerce-blocks/tests/e2e/config/jest.config.js rename to plugins/woocommerce-blocks/tests/e2e-jest/config/jest.config.js index 1253835cb1b..80f78e5a5d0 100644 --- a/plugins/woocommerce-blocks/tests/e2e/config/jest.config.js +++ b/plugins/woocommerce-blocks/tests/e2e-jest/config/jest.config.js @@ -16,22 +16,22 @@ module.exports = { process.env.CI && '@wordpress/e2e-tests/config/flaky-tests-reporter.js', ].filter( Boolean ), - testEnvironment: '/tests/e2e/config/environment.js', + testEnvironment: '/tests/e2e-jest/config/environment.js', testRunner: 'jest-circus/runner', // Where to look for test files - roots: [ '/tests/e2e/specs' ], - globalSetup: '/tests/e2e/config/setup.js', - globalTeardown: '/tests/e2e/config/teardown.js', + roots: [ '/tests/e2e-jest/specs' ], + globalSetup: '/tests/e2e-jest/config/setup.js', + globalTeardown: '/tests/e2e-jest/config/teardown.js', setupFiles: [], // A list of paths to modules that run some code to configure or set up the testing framework // before each test setupFilesAfterEnv: [ - '/tests/e2e/config/custom-matchers/index.js', - '/tests/e2e/config/jest.setup.js', + '/tests/e2e-jest/config/custom-matchers/index.js', + '/tests/e2e-jest/config/jest.setup.js', 'expect-puppeteer', ], testPathIgnorePatterns: [ - '/tests/e2e/specs/performance', + '/tests/e2e-jest/specs/performance', // Ignore all the files that have utils in the name 'utils', ], diff --git a/plugins/woocommerce-blocks/tests/e2e/config/jest.performance.config.js b/plugins/woocommerce-blocks/tests/e2e-jest/config/jest.performance.config.js similarity index 55% rename from plugins/woocommerce-blocks/tests/e2e/config/jest.performance.config.js rename to plugins/woocommerce-blocks/tests/e2e-jest/config/jest.performance.config.js index ba8d7583d37..06effd7ae21 100644 --- a/plugins/woocommerce-blocks/tests/e2e/config/jest.performance.config.js +++ b/plugins/woocommerce-blocks/tests/e2e-jest/config/jest.performance.config.js @@ -3,11 +3,11 @@ module.exports = { reporters: [ 'default', - '/tests/e2e/config/performance-reporter.js', + '/tests/e2e-jest/config/performance-reporter.js', ], // Where to look for test files - roots: [ '/tests/e2e/specs/performance' ], + roots: [ '/tests/e2e-jest/specs/performance' ], testPathIgnorePatterns: [], }; diff --git a/plugins/woocommerce-blocks/tests/e2e/config/jest.setup.js b/plugins/woocommerce-blocks/tests/e2e-jest/config/jest.setup.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/config/jest.setup.js rename to plugins/woocommerce-blocks/tests/e2e-jest/config/jest.setup.js diff --git a/plugins/woocommerce-blocks/tests/e2e/config/performance-reporter.js b/plugins/woocommerce-blocks/tests/e2e-jest/config/performance-reporter.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/config/performance-reporter.js rename to plugins/woocommerce-blocks/tests/e2e-jest/config/performance-reporter.js diff --git a/plugins/woocommerce-blocks/tests/e2e/config/setup.js b/plugins/woocommerce-blocks/tests/e2e-jest/config/setup.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/config/setup.js rename to plugins/woocommerce-blocks/tests/e2e-jest/config/setup.js diff --git a/plugins/woocommerce-blocks/tests/e2e/config/teardown.js b/plugins/woocommerce-blocks/tests/e2e-jest/config/teardown.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/config/teardown.js rename to plugins/woocommerce-blocks/tests/e2e-jest/config/teardown.js diff --git a/plugins/woocommerce-blocks/tests/e2e/config/test.json b/plugins/woocommerce-blocks/tests/e2e-jest/config/test.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/config/test.json rename to plugins/woocommerce-blocks/tests/e2e-jest/config/test.json diff --git a/plugins/woocommerce-blocks/tests/e2e/fixtures/fixture-data.js b/plugins/woocommerce-blocks/tests/e2e-jest/fixtures/fixture-data.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/fixtures/fixture-data.js rename to plugins/woocommerce-blocks/tests/e2e-jest/fixtures/fixture-data.js diff --git a/plugins/woocommerce-blocks/tests/e2e/fixtures/fixture-loaders.js b/plugins/woocommerce-blocks/tests/e2e-jest/fixtures/fixture-loaders.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/fixtures/fixture-loaders.js rename to plugins/woocommerce-blocks/tests/e2e-jest/fixtures/fixture-loaders.js diff --git a/plugins/woocommerce-blocks/tests/e2e/page-utils.js b/plugins/woocommerce-blocks/tests/e2e-jest/page-utils.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/page-utils.js rename to plugins/woocommerce-blocks/tests/e2e-jest/page-utils.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/active-filters.fixture.json b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/active-filters.fixture.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/active-filters.fixture.json rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/active-filters.fixture.json diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/all-products.fixture.json b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/all-products.fixture.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/all-products.fixture.json rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/all-products.fixture.json diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/all-reviews.fixture.json b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/all-reviews.fixture.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/all-reviews.fixture.json rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/all-reviews.fixture.json diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/cart.fixture.json b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/cart.fixture.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/cart.fixture.json rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/cart.fixture.json diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/checkout.fixture.json b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/checkout.fixture.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/checkout.fixture.json rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/checkout.fixture.json diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/featured-product.fixture.json b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/featured-product.fixture.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/featured-product.fixture.json rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/featured-product.fixture.json diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/filter-products-by-attribute.fixture.json b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/filter-products-by-attribute.fixture.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/filter-products-by-attribute.fixture.json rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/filter-products-by-attribute.fixture.json diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/filter-products-by-price.fixture.json b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/filter-products-by-price.fixture.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/filter-products-by-price.fixture.json rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/filter-products-by-price.fixture.json diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/filter-products-by-stock.fixture.json b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/filter-products-by-stock.fixture.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/filter-products-by-stock.fixture.json rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/filter-products-by-stock.fixture.json diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/mini-cart.fixture.json b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/mini-cart.fixture.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/mini-cart.fixture.json rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/mini-cart.fixture.json diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/product-category.fixture.json b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/product-category.fixture.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/product-category.fixture.json rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/product-category.fixture.json diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/product-on-sale.fixture.json b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/product-on-sale.fixture.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/product-on-sale.fixture.json rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/product-on-sale.fixture.json diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/product-search-legacy.fixture.json b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/product-search-legacy.fixture.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/product-search-legacy.fixture.json rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/product-search-legacy.fixture.json diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/product-search.fixture.json b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/product-search.fixture.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/product-search.fixture.json rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/product-search.fixture.json diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/product-tag.fixture.json b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/product-tag.fixture.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/product-tag.fixture.json rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/product-tag.fixture.json diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/products-beta.fixture.json b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/products-beta.fixture.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/products-beta.fixture.json rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/products-beta.fixture.json diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/products-by-attribute.fixture.json b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/products-by-attribute.fixture.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/products-by-attribute.fixture.json rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/products-by-attribute.fixture.json diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/reviews-by-category.fixture.json b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/reviews-by-category.fixture.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/reviews-by-category.fixture.json rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/reviews-by-category.fixture.json diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/reviews-by-product.fixture.json b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/reviews-by-product.fixture.json similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/__fixtures__/reviews-by-product.fixture.json rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/__fixtures__/reviews-by-product.fixture.json diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/active-filters.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/active-filters.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/active-filters.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/active-filters.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/add-to-cart-form.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/add-to-cart-form.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/add-to-cart-form.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/add-to-cart-form.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/all-products.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/all-products.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/all-products.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/all-products.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/all-reviews.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/all-reviews.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/all-reviews.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/all-reviews.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/attribute-filter.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/attribute-filter.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/attribute-filter.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/attribute-filter.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/breadcrumbs.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/breadcrumbs.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/breadcrumbs.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/breadcrumbs.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/cart.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/cart.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/cart.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/cart.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/catalog-sorting.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/catalog-sorting.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/catalog-sorting.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/catalog-sorting.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/checkout.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/checkout.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/checkout.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/checkout.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/customer-account.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/customer-account.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/customer-account.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/customer-account.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/featured-category.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/featured-category.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/featured-category.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/featured-category.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/featured-product.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/featured-product.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/featured-product.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/featured-product.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/handpicked-products.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/handpicked-products.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/handpicked-products.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/handpicked-products.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/mini-cart.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/mini-cart.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/mini-cart.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/mini-cart.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/price-filter.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/price-filter.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/price-filter.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/price-filter.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/product-best-sellers.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-best-sellers.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/product-best-sellers.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-best-sellers.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/product-categories.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-categories.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/product-categories.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-categories.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/product-category.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-category.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/product-category.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-category.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/product-new.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-new.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/product-new.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-new.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/product-on-sale.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-on-sale.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/product-on-sale.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-on-sale.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/product-query.test.ts b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-query.test.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/product-query.test.ts rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-query.test.ts diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/product-query/advanced-filters.test.ts b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-query/advanced-filters.test.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/product-query/advanced-filters.test.ts rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-query/advanced-filters.test.ts diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/product-query/atomic-blocks.test.ts b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-query/atomic-blocks.test.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/product-query/atomic-blocks.test.ts rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-query/atomic-blocks.test.ts diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/product-query/common.ts b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-query/common.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/product-query/common.ts rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-query/common.ts diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/product-query/popular-filters.test.ts b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-query/popular-filters.test.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/product-query/popular-filters.test.ts rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-query/popular-filters.test.ts diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/product-results-count.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-results-count.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/product-results-count.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-results-count.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/product-search-legacy.test.ts b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-search-legacy.test.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/product-search-legacy.test.ts rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-search-legacy.test.ts diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/product-search.test.ts b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-search.test.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/product-search.test.ts rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-search.test.ts diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/product-tag.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-tag.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/product-tag.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-tag.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/product-top-rated.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-top-rated.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/product-top-rated.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/product-top-rated.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/products-by-attribute.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/products-by-attribute.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/products-by-attribute.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/products-by-attribute.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/rating-filter.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/rating-filter.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/rating-filter.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/rating-filter.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/reviews-by-category.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/reviews-by-category.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/reviews-by-category.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/reviews-by-category.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/reviews-by-product.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/reviews-by-product.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/reviews-by-product.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/reviews-by-product.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/single-product-details.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/single-product-details.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/single-product-details.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/single-product-details.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/stock-filter.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/stock-filter.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/stock-filter.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/stock-filter.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/store-notices.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/store-notices.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/backend/store-notices.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/backend/store-notices.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/merchant/checkout-terms.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/merchant/checkout-terms.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/merchant/checkout-terms.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/merchant/checkout-terms.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/merchant/local-pickup.test.ts b/plugins/woocommerce-blocks/tests/e2e-jest/specs/merchant/local-pickup.test.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/merchant/local-pickup.test.ts rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/merchant/local-pickup.test.ts diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/performance/cart.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/performance/cart.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/performance/cart.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/performance/cart.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/shopper/active-filters.test.ts b/plugins/woocommerce-blocks/tests/e2e-jest/specs/shopper/active-filters.test.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/shopper/active-filters.test.ts rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/shopper/active-filters.test.ts diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/shopper/cart-checkout/account.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/shopper/cart-checkout/account.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/shopper/cart-checkout/account.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/shopper/cart-checkout/account.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/shopper/cart-checkout/cart.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/shopper/cart-checkout/cart.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/shopper/cart-checkout/cart.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/shopper/cart-checkout/cart.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/shopper/cart-checkout/checkout.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/shopper/cart-checkout/checkout.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/shopper/cart-checkout/checkout.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/shopper/cart-checkout/checkout.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/shopper/cart-checkout/tax.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/shopper/cart-checkout/tax.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/shopper/cart-checkout/tax.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/shopper/cart-checkout/tax.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/shopper/cart-checkout/translations.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/shopper/cart-checkout/translations.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/shopper/cart-checkout/translations.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/shopper/cart-checkout/translations.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/shopper/filter-products-by-attribute.test.ts b/plugins/woocommerce-blocks/tests/e2e-jest/specs/shopper/filter-products-by-attribute.test.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/shopper/filter-products-by-attribute.test.ts rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/shopper/filter-products-by-attribute.test.ts diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/shopper/filter-products-by-price.test.ts b/plugins/woocommerce-blocks/tests/e2e-jest/specs/shopper/filter-products-by-price.test.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/shopper/filter-products-by-price.test.ts rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/shopper/filter-products-by-price.test.ts diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/shopper/filter-products-by-rating.test.ts b/plugins/woocommerce-blocks/tests/e2e-jest/specs/shopper/filter-products-by-rating.test.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/shopper/filter-products-by-rating.test.ts rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/shopper/filter-products-by-rating.test.ts diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/shopper/filter-products-by-stock.test.ts b/plugins/woocommerce-blocks/tests/e2e-jest/specs/shopper/filter-products-by-stock.test.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/shopper/filter-products-by-stock.test.ts rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/shopper/filter-products-by-stock.test.ts diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/shopper/mini-cart.test.js b/plugins/woocommerce-blocks/tests/e2e-jest/specs/shopper/mini-cart.test.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/shopper/mini-cart.test.js rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/shopper/mini-cart.test.js diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/shopper/product-search.test.ts b/plugins/woocommerce-blocks/tests/e2e-jest/specs/shopper/product-search.test.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/specs/shopper/product-search.test.ts rename to plugins/woocommerce-blocks/tests/e2e-jest/specs/shopper/product-search.test.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-jest/tsconfig.json b/plugins/woocommerce-blocks/tests/e2e-jest/tsconfig.json new file mode 100644 index 00000000000..b361441cde5 --- /dev/null +++ b/plugins/woocommerce-blocks/tests/e2e-jest/tsconfig.json @@ -0,0 +1,3 @@ +{ + "extends": "../../tsconfig.base.json" +} diff --git a/plugins/woocommerce-blocks/tests/e2e/utils.js b/plugins/woocommerce-blocks/tests/e2e-jest/utils.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e/utils.js rename to plugins/woocommerce-blocks/tests/e2e-jest/utils.js diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/tsconfig.json b/plugins/woocommerce-blocks/tests/e2e-pw/tsconfig.json deleted file mode 100644 index f52a4d12b49..00000000000 --- a/plugins/woocommerce-blocks/tests/e2e-pw/tsconfig.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", -} diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/.eslintrc.js b/plugins/woocommerce-blocks/tests/e2e/.eslintrc.js similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/.eslintrc.js rename to plugins/woocommerce-blocks/tests/e2e/.eslintrc.js diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/README.md b/plugins/woocommerce-blocks/tests/e2e/README.md similarity index 84% rename from plugins/woocommerce-blocks/tests/e2e-pw/README.md rename to plugins/woocommerce-blocks/tests/e2e/README.md index f363128bd1d..576cf98da2f 100644 --- a/plugins/woocommerce-blocks/tests/e2e-pw/README.md +++ b/plugins/woocommerce-blocks/tests/e2e/README.md @@ -1,6 +1,6 @@ # WooCommerce Blocks Playwright End to End Tests -This is the documentation for the new E2E testing setup based on Playwright and wp-env. Over time, these playwright E2E tests should replace the current [Puppeteer E2E tests](../e2e/). +This is the documentation for the new E2E testing setup based on Playwright and wp-env. Over time, these playwright E2E tests should replace the current [Puppeteer E2E tests](../e2e-jest/). ## Table of contents @@ -18,7 +18,7 @@ This is the documentation for the new E2E testing setup based on Playwright and Note, that if you are on Mac and you install docker through other methods such as homebrew, for example, your steps to set it up might be different. The commands listed in steps below may also vary. -If you are using Windows, we recommend using [Windows Subsystem for Linux (WSL)](https://docs.microsoft.com/en-us/windows/wsl/) for running E2E tests. Follow the [WSL Setup Instructions](../tests/e2e/WSL_SETUP_INSTRUCTIONS.md) first before proceeding with the steps below. +If you are using Windows, we recommend using [Windows Subsystem for Linux (WSL)](https://docs.microsoft.com/en-us/windows/wsl/) for running E2E tests. Follow the [WSL Setup Instructions](../tests/e2e-jest/WSL_SETUP_INSTRUCTIONS.md) first before proceeding with the steps below. ## Introduction @@ -39,7 +39,7 @@ npm run env:start ``` ```sh -npm run test:e2e-pw +npm run test:e2e ``` ### To run the test again, re-create the environment to start with a fresh state @@ -49,7 +49,7 @@ npm run env:restart ``` ```sh -npm run test:e2e-pw +npm run test:e2e ``` ### Other ways of running tests @@ -57,31 +57,31 @@ npm run test:e2e-pw Headless mode: ```sh -npm run test:e2e-pw +npm run test:e2e ``` Interactive UI mode: ```sh -npm run test:e2e-pw -- --ui +npm run test:e2e -- --ui ``` Headed mode: ```sh -npm run test:e2e-pw -- --headed +npm run test:e2e -- --headed ``` Debug mode: ```sh -npm run test:e2e-pw -- --debug +npm run test:e2e -- --debug ``` Running a single test: ```sh -npm run test:e2e-pw ./tests/e2e-pw/tests/example.spec.ts +npm run test:e2e ./tests/e2e/tests/example.spec.ts ``` To see all options, run the following command: diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/bin/active-filters.txt b/plugins/woocommerce-blocks/tests/e2e/bin/active-filters.txt similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/bin/active-filters.txt rename to plugins/woocommerce-blocks/tests/e2e/bin/active-filters.txt diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/bin/all-products.txt b/plugins/woocommerce-blocks/tests/e2e/bin/all-products.txt similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/bin/all-products.txt rename to plugins/woocommerce-blocks/tests/e2e/bin/all-products.txt diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/bin/all-reviews.txt b/plugins/woocommerce-blocks/tests/e2e/bin/all-reviews.txt similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/bin/all-reviews.txt rename to plugins/woocommerce-blocks/tests/e2e/bin/all-reviews.txt diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/bin/cart.txt b/plugins/woocommerce-blocks/tests/e2e/bin/cart.txt similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/bin/cart.txt rename to plugins/woocommerce-blocks/tests/e2e/bin/cart.txt diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/bin/checkout.txt b/plugins/woocommerce-blocks/tests/e2e/bin/checkout.txt similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/bin/checkout.txt rename to plugins/woocommerce-blocks/tests/e2e/bin/checkout.txt diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/bin/customer-account.txt b/plugins/woocommerce-blocks/tests/e2e/bin/customer-account.txt similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/bin/customer-account.txt rename to plugins/woocommerce-blocks/tests/e2e/bin/customer-account.txt diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/bin/featured-category.txt b/plugins/woocommerce-blocks/tests/e2e/bin/featured-category.txt similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/bin/featured-category.txt rename to plugins/woocommerce-blocks/tests/e2e/bin/featured-category.txt diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/bin/featured-product.txt b/plugins/woocommerce-blocks/tests/e2e/bin/featured-product.txt similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/bin/featured-product.txt rename to plugins/woocommerce-blocks/tests/e2e/bin/featured-product.txt diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/bin/handpicked-products.txt b/plugins/woocommerce-blocks/tests/e2e/bin/handpicked-products.txt similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/bin/handpicked-products.txt rename to plugins/woocommerce-blocks/tests/e2e/bin/handpicked-products.txt diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/bin/mini-cart.txt b/plugins/woocommerce-blocks/tests/e2e/bin/mini-cart.txt similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/bin/mini-cart.txt rename to plugins/woocommerce-blocks/tests/e2e/bin/mini-cart.txt diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/bin/my-account.txt b/plugins/woocommerce-blocks/tests/e2e/bin/my-account.txt similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/bin/my-account.txt rename to plugins/woocommerce-blocks/tests/e2e/bin/my-account.txt diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/bin/product-best-sellers.txt b/plugins/woocommerce-blocks/tests/e2e/bin/product-best-sellers.txt similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/bin/product-best-sellers.txt rename to plugins/woocommerce-blocks/tests/e2e/bin/product-best-sellers.txt diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/bin/product-categories.txt b/plugins/woocommerce-blocks/tests/e2e/bin/product-categories.txt similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/bin/product-categories.txt rename to plugins/woocommerce-blocks/tests/e2e/bin/product-categories.txt diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/bin/product-category.txt b/plugins/woocommerce-blocks/tests/e2e/bin/product-category.txt similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/bin/product-category.txt rename to plugins/woocommerce-blocks/tests/e2e/bin/product-category.txt diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/bin/product-new.txt b/plugins/woocommerce-blocks/tests/e2e/bin/product-new.txt similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/bin/product-new.txt rename to plugins/woocommerce-blocks/tests/e2e/bin/product-new.txt diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/bin/product-on-sale.txt b/plugins/woocommerce-blocks/tests/e2e/bin/product-on-sale.txt similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/bin/product-on-sale.txt rename to plugins/woocommerce-blocks/tests/e2e/bin/product-on-sale.txt diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/bin/product-search.txt b/plugins/woocommerce-blocks/tests/e2e/bin/product-search.txt similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/bin/product-search.txt rename to plugins/woocommerce-blocks/tests/e2e/bin/product-search.txt diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/bin/product-top-rated.txt b/plugins/woocommerce-blocks/tests/e2e/bin/product-top-rated.txt similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/bin/product-top-rated.txt rename to plugins/woocommerce-blocks/tests/e2e/bin/product-top-rated.txt diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/bin/products-by-attribute.txt b/plugins/woocommerce-blocks/tests/e2e/bin/products-by-attribute.txt similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/bin/products-by-attribute.txt rename to plugins/woocommerce-blocks/tests/e2e/bin/products-by-attribute.txt diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/bin/reviews-by-category.txt b/plugins/woocommerce-blocks/tests/e2e/bin/reviews-by-category.txt similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/bin/reviews-by-category.txt rename to plugins/woocommerce-blocks/tests/e2e/bin/reviews-by-category.txt diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/bin/reviews-by-product.txt b/plugins/woocommerce-blocks/tests/e2e/bin/reviews-by-product.txt similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/bin/reviews-by-product.txt rename to plugins/woocommerce-blocks/tests/e2e/bin/reviews-by-product.txt diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/bin/single-product.txt b/plugins/woocommerce-blocks/tests/e2e/bin/single-product.txt similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/bin/single-product.txt rename to plugins/woocommerce-blocks/tests/e2e/bin/single-product.txt diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/bin/test-env-setup.sh b/plugins/woocommerce-blocks/tests/e2e/bin/test-env-setup.sh similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/bin/test-env-setup.sh rename to plugins/woocommerce-blocks/tests/e2e/bin/test-env-setup.sh diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/block-theme.setup.ts b/plugins/woocommerce-blocks/tests/e2e/block-theme.setup.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/block-theme.setup.ts rename to plugins/woocommerce-blocks/tests/e2e/block-theme.setup.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/classic-theme.setup.ts b/plugins/woocommerce-blocks/tests/e2e/classic-theme.setup.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/classic-theme.setup.ts rename to plugins/woocommerce-blocks/tests/e2e/classic-theme.setup.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/global-setup.ts b/plugins/woocommerce-blocks/tests/e2e/global-setup.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/global-setup.ts rename to plugins/woocommerce-blocks/tests/e2e/global-setup.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/global-teardown.ts b/plugins/woocommerce-blocks/tests/e2e/global-teardown.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/global-teardown.ts rename to plugins/woocommerce-blocks/tests/e2e/global-teardown.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/playwright-utils/index.ts b/plugins/woocommerce-blocks/tests/e2e/playwright-utils/index.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/playwright-utils/index.ts rename to plugins/woocommerce-blocks/tests/e2e/playwright-utils/index.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/playwright-utils/test.ts b/plugins/woocommerce-blocks/tests/e2e/playwright-utils/test.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/playwright-utils/test.ts rename to plugins/woocommerce-blocks/tests/e2e/playwright-utils/test.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/playwright.config.ts b/plugins/woocommerce-blocks/tests/e2e/playwright.config.ts similarity index 97% rename from plugins/woocommerce-blocks/tests/e2e-pw/playwright.config.ts rename to plugins/woocommerce-blocks/tests/e2e/playwright.config.ts index d81ecf006e4..dec6eb0530a 100644 --- a/plugins/woocommerce-blocks/tests/e2e-pw/playwright.config.ts +++ b/plugins/woocommerce-blocks/tests/e2e/playwright.config.ts @@ -35,7 +35,7 @@ const config: ExtendedPlaywrightTestConfig = { use: { baseURL: BASE_URL, screenshot: 'only-on-failure', - stateDir: 'tests/e2e-pw/test-results/storage/', + stateDir: 'tests/e2e/test-results/storage/', trace: 'retain-on-failure', video: 'on-first-retry', viewport: { width: 1280, height: 720 }, diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/test-data/data/data.ts b/plugins/woocommerce-blocks/tests/e2e/test-data/data/data.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/test-data/data/data.ts rename to plugins/woocommerce-blocks/tests/e2e/test-data/data/data.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/tests/attributes-filter/filter-products-by-attributes-count.block_theme.spec.ts b/plugins/woocommerce-blocks/tests/e2e/tests/attributes-filter/filter-products-by-attributes-count.block_theme.spec.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/tests/attributes-filter/filter-products-by-attributes-count.block_theme.spec.ts rename to plugins/woocommerce-blocks/tests/e2e/tests/attributes-filter/filter-products-by-attributes-count.block_theme.spec.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/tests/basic.block_theme.spec.ts b/plugins/woocommerce-blocks/tests/e2e/tests/basic.block_theme.spec.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/tests/basic.block_theme.spec.ts rename to plugins/woocommerce-blocks/tests/e2e/tests/basic.block_theme.spec.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/tests/cart-checkout/cart-block.merchant.block_theme.spec.ts b/plugins/woocommerce-blocks/tests/e2e/tests/cart-checkout/cart-block.merchant.block_theme.spec.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/tests/cart-checkout/cart-block.merchant.block_theme.spec.ts rename to plugins/woocommerce-blocks/tests/e2e/tests/cart-checkout/cart-block.merchant.block_theme.spec.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/tests/classic-template/classic-template.block_theme.side_effects.spec.ts b/plugins/woocommerce-blocks/tests/e2e/tests/classic-template/classic-template.block_theme.side_effects.spec.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/tests/classic-template/classic-template.block_theme.side_effects.spec.ts rename to plugins/woocommerce-blocks/tests/e2e/tests/classic-template/classic-template.block_theme.side_effects.spec.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/tests/classic-template/utils.ts b/plugins/woocommerce-blocks/tests/e2e/tests/classic-template/utils.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/tests/classic-template/utils.ts rename to plugins/woocommerce-blocks/tests/e2e/tests/classic-template/utils.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/tests/customer-account/customer-account.block_theme.spec.ts b/plugins/woocommerce-blocks/tests/e2e/tests/customer-account/customer-account.block_theme.spec.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/tests/customer-account/customer-account.block_theme.spec.ts rename to plugins/woocommerce-blocks/tests/e2e/tests/customer-account/customer-account.block_theme.spec.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/tests/mini-cart/mini-cart.block_theme.spec.ts b/plugins/woocommerce-blocks/tests/e2e/tests/mini-cart/mini-cart.block_theme.spec.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/tests/mini-cart/mini-cart.block_theme.spec.ts rename to plugins/woocommerce-blocks/tests/e2e/tests/mini-cart/mini-cart.block_theme.spec.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/tests/permalink-settings/permalink-settings.block_theme.spec.ts b/plugins/woocommerce-blocks/tests/e2e/tests/permalink-settings/permalink-settings.block_theme.spec.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/tests/permalink-settings/permalink-settings.block_theme.spec.ts rename to plugins/woocommerce-blocks/tests/e2e/tests/permalink-settings/permalink-settings.block_theme.spec.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/tests/price-filter/price-filter.block_theme.side_effects.spec.ts b/plugins/woocommerce-blocks/tests/e2e/tests/price-filter/price-filter.block_theme.side_effects.spec.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/tests/price-filter/price-filter.block_theme.side_effects.spec.ts rename to plugins/woocommerce-blocks/tests/e2e/tests/price-filter/price-filter.block_theme.side_effects.spec.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/tests/price-filter/utils.ts b/plugins/woocommerce-blocks/tests/e2e/tests/price-filter/utils.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/tests/price-filter/utils.ts rename to plugins/woocommerce-blocks/tests/e2e/tests/price-filter/utils.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/tests/product-collection/product-collection.block_theme.spec.ts b/plugins/woocommerce-blocks/tests/e2e/tests/product-collection/product-collection.block_theme.spec.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/tests/product-collection/product-collection.block_theme.spec.ts rename to plugins/woocommerce-blocks/tests/e2e/tests/product-collection/product-collection.block_theme.spec.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/tests/product-collection/product-collection.page.ts b/plugins/woocommerce-blocks/tests/e2e/tests/product-collection/product-collection.page.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/tests/product-collection/product-collection.page.ts rename to plugins/woocommerce-blocks/tests/e2e/tests/product-collection/product-collection.page.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/tests/product-gallery/inner-blocks/product-gallery-thumbnails/product-gallery-thumbnails.block_theme.spec.ts b/plugins/woocommerce-blocks/tests/e2e/tests/product-gallery/inner-blocks/product-gallery-thumbnails/product-gallery-thumbnails.block_theme.spec.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/tests/product-gallery/inner-blocks/product-gallery-thumbnails/product-gallery-thumbnails.block_theme.spec.ts rename to plugins/woocommerce-blocks/tests/e2e/tests/product-gallery/inner-blocks/product-gallery-thumbnails/product-gallery-thumbnails.block_theme.spec.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/tests/product-gallery/inner-blocks/product-gallery-thumbnails/utils.ts b/plugins/woocommerce-blocks/tests/e2e/tests/product-gallery/inner-blocks/product-gallery-thumbnails/utils.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/tests/product-gallery/inner-blocks/product-gallery-thumbnails/utils.ts rename to plugins/woocommerce-blocks/tests/e2e/tests/product-gallery/inner-blocks/product-gallery-thumbnails/utils.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/tests/products/products.block_theme.side_effects.spec.ts b/plugins/woocommerce-blocks/tests/e2e/tests/products/products.block_theme.side_effects.spec.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/tests/products/products.block_theme.side_effects.spec.ts rename to plugins/woocommerce-blocks/tests/e2e/tests/products/products.block_theme.side_effects.spec.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/tests/products/utils.ts b/plugins/woocommerce-blocks/tests/e2e/tests/products/utils.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/tests/products/utils.ts rename to plugins/woocommerce-blocks/tests/e2e/tests/products/utils.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/tests/single-product-template/single-product-template.block_theme.spec.ts b/plugins/woocommerce-blocks/tests/e2e/tests/single-product-template/single-product-template.block_theme.spec.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/tests/single-product-template/single-product-template.block_theme.spec.ts rename to plugins/woocommerce-blocks/tests/e2e/tests/single-product-template/single-product-template.block_theme.spec.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/tests/templates/cart-template.block_theme.spec.ts b/plugins/woocommerce-blocks/tests/e2e/tests/templates/cart-template.block_theme.spec.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/tests/templates/cart-template.block_theme.spec.ts rename to plugins/woocommerce-blocks/tests/e2e/tests/templates/cart-template.block_theme.spec.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/tests/templates/checkout-header-template-part.block_theme.spec.ts b/plugins/woocommerce-blocks/tests/e2e/tests/templates/checkout-header-template-part.block_theme.spec.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/tests/templates/checkout-header-template-part.block_theme.spec.ts rename to plugins/woocommerce-blocks/tests/e2e/tests/templates/checkout-header-template-part.block_theme.spec.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/tests/templates/checkout-template.block_theme.spec.ts b/plugins/woocommerce-blocks/tests/e2e/tests/templates/checkout-template.block_theme.spec.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/tests/templates/checkout-template.block_theme.spec.ts rename to plugins/woocommerce-blocks/tests/e2e/tests/templates/checkout-template.block_theme.spec.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/tests/templates/order-confirmation.block_theme.spec.ts b/plugins/woocommerce-blocks/tests/e2e/tests/templates/order-confirmation.block_theme.spec.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/tests/templates/order-confirmation.block_theme.spec.ts rename to plugins/woocommerce-blocks/tests/e2e/tests/templates/order-confirmation.block_theme.spec.ts diff --git a/plugins/woocommerce-blocks/tests/e2e/tsconfig.json b/plugins/woocommerce-blocks/tests/e2e/tsconfig.json index b361441cde5..f52a4d12b49 100644 --- a/plugins/woocommerce-blocks/tests/e2e/tsconfig.json +++ b/plugins/woocommerce-blocks/tests/e2e/tsconfig.json @@ -1,3 +1,3 @@ { - "extends": "../../tsconfig.base.json" + "extends": "../../tsconfig.base.json", } diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/types/block-data.ts b/plugins/woocommerce-blocks/tests/e2e/types/block-data.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/types/block-data.ts rename to plugins/woocommerce-blocks/tests/e2e/types/block-data.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/types/index.ts b/plugins/woocommerce-blocks/tests/e2e/types/index.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/types/index.ts rename to plugins/woocommerce-blocks/tests/e2e/types/index.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/utils/api/TemplateApiUtils.ts b/plugins/woocommerce-blocks/tests/e2e/utils/api/TemplateApiUtils.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/utils/api/TemplateApiUtils.ts rename to plugins/woocommerce-blocks/tests/e2e/utils/api/TemplateApiUtils.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/utils/api/index.ts b/plugins/woocommerce-blocks/tests/e2e/utils/api/index.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/utils/api/index.ts rename to plugins/woocommerce-blocks/tests/e2e/utils/api/index.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/utils/cli.ts b/plugins/woocommerce-blocks/tests/e2e/utils/cli.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/utils/cli.ts rename to plugins/woocommerce-blocks/tests/e2e/utils/cli.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/utils/constants.ts b/plugins/woocommerce-blocks/tests/e2e/utils/constants.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/utils/constants.ts rename to plugins/woocommerce-blocks/tests/e2e/utils/constants.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/utils/editor/EditorUtils.ts b/plugins/woocommerce-blocks/tests/e2e/utils/editor/EditorUtils.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/utils/editor/EditorUtils.ts rename to plugins/woocommerce-blocks/tests/e2e/utils/editor/EditorUtils.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/utils/editor/index.ts b/plugins/woocommerce-blocks/tests/e2e/utils/editor/index.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/utils/editor/index.ts rename to plugins/woocommerce-blocks/tests/e2e/utils/editor/index.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/utils/frontend/FrontendUtils.ts b/plugins/woocommerce-blocks/tests/e2e/utils/frontend/FrontendUtils.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/utils/frontend/FrontendUtils.ts rename to plugins/woocommerce-blocks/tests/e2e/utils/frontend/FrontendUtils.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/utils/frontend/index.ts b/plugins/woocommerce-blocks/tests/e2e/utils/frontend/index.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/utils/frontend/index.ts rename to plugins/woocommerce-blocks/tests/e2e/utils/frontend/index.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/utils/index.ts b/plugins/woocommerce-blocks/tests/e2e/utils/index.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/utils/index.ts rename to plugins/woocommerce-blocks/tests/e2e/utils/index.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/utils/navigation/navigation.ts b/plugins/woocommerce-blocks/tests/e2e/utils/navigation/navigation.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/utils/navigation/navigation.ts rename to plugins/woocommerce-blocks/tests/e2e/utils/navigation/navigation.ts diff --git a/plugins/woocommerce-blocks/tests/e2e-pw/utils/use-block-theme.ts b/plugins/woocommerce-blocks/tests/e2e/utils/use-block-theme.ts similarity index 100% rename from plugins/woocommerce-blocks/tests/e2e-pw/utils/use-block-theme.ts rename to plugins/woocommerce-blocks/tests/e2e/utils/use-block-theme.ts diff --git a/plugins/woocommerce-blocks/tests/utils/get-fixture-products-data.ts b/plugins/woocommerce-blocks/tests/utils/get-fixture-products-data.ts index 02a727e04c1..7ad8dfd0dae 100644 --- a/plugins/woocommerce-blocks/tests/utils/get-fixture-products-data.ts +++ b/plugins/woocommerce-blocks/tests/utils/get-fixture-products-data.ts @@ -1,7 +1,7 @@ /** * Internal dependencies */ -import { Products } from '../e2e/fixtures/fixture-data'; +import { Products } from '../e2e-jest/fixtures/fixture-data'; /** * Get products data by key from fixtures. diff --git a/plugins/woocommerce-blocks/tests/utils/shopper.js b/plugins/woocommerce-blocks/tests/utils/shopper.js index 863023bdf75..6ac25d6e890 100644 --- a/plugins/woocommerce-blocks/tests/utils/shopper.js +++ b/plugins/woocommerce-blocks/tests/utils/shopper.js @@ -12,7 +12,7 @@ import { pressKeyWithModifier } from '@wordpress/e2e-test-utils'; /** * Internal dependencies */ -import { BASE_URL } from '../e2e/utils'; +import { BASE_URL } from '../e2e-jest/utils'; import { getCartItemPathExpression, getQtyInputPathExpression, diff --git a/plugins/woocommerce-blocks/tests/utils/visit-block-page.js b/plugins/woocommerce-blocks/tests/utils/visit-block-page.js index 9e1646a8b90..9bf8db90741 100644 --- a/plugins/woocommerce-blocks/tests/utils/visit-block-page.js +++ b/plugins/woocommerce-blocks/tests/utils/visit-block-page.js @@ -14,7 +14,7 @@ import { paramCase as kebabCase } from 'change-case'; * Internal dependencies */ import { clickLink } from '.'; -import { insertBlockDontWaitForInsertClose } from '../e2e/utils.js'; +import { insertBlockDontWaitForInsertClose } from '../e2e-jest/utils.js'; /** * This will visit a GB page or post, and will hide the welcome guide. diff --git a/plugins/woocommerce-blocks/tsconfig.base.json b/plugins/woocommerce-blocks/tsconfig.base.json index 5ab95a5f87d..156236dc9cf 100644 --- a/plugins/woocommerce-blocks/tsconfig.base.json +++ b/plugins/woocommerce-blocks/tsconfig.base.json @@ -62,9 +62,9 @@ "@woocommerce/types": [ "assets/js/types" ], "@woocommerce/storybook-controls": [ "storybook/custom-controls" ], "@woocommerce/utils": [ "assets/js/utils" ], - "@woocommerce/e2e-utils": [ "tests/e2e-pw/utils" ], - "@woocommerce/e2e-types": [ "tests/e2e-pw/types" ], - "@woocommerce/e2e-playwright-utils": [ "tests/e2e-pw/playwright-utils" ], + "@woocommerce/e2e-utils": [ "tests/e2e/utils" ], + "@woocommerce/e2e-types": [ "tests/e2e/types" ], + "@woocommerce/e2e-playwright-utils": [ "tests/e2e/playwright-utils" ], "@woocommerce/templates/*": [ "assets/js/templates/*" ] } }