Reorganisation of e2e tests

packages/e2e-tests/jest.config.js

@@ -12,6 +12,6 @@ module.exports = {
 	testPathIgnorePatterns: [
 		'/node_modules/',
 		'/wordpress/',
-		'e2e-tests/specs/performance.test.js',
+		'e2e-tests/specs/performance/',
 	],
 };

packages/e2e-tests/jest.performance.config.js

@@ -1,7 +1,7 @@
 module.exports = {
 	...require( '@wordpress/scripts/config/jest-e2e.config' ),
 	testMatch: [
-		'**/performance.test.js',
+		'**/performance/*.test.js',
 	],
 	setupFiles: [
 		'<rootDir>/config/gutenberg-phase.js',

packages/e2e-tests/specs/blocks/classic.test.js → packages/e2e-tests/specs/editor/blocks/classic.test.js

@@ -49,7 +49,7 @@ describe( 'Classic', () => {
 		// Wait for media modal to appear and upload image.
 		await page.waitForSelector( '.media-modal input[type=file]' );
 		const inputElement = await page.$( '.media-modal input[type=file]' );
-		const testImagePath = path.join( __dirname, '..', '..', 'assets', '10x10_e2e_test_image_z9T8jK.png' );
+		const testImagePath = path.join( __dirname, '..', '..', '..', 'assets', '10x10_e2e_test_image_z9T8jK.png' );
 		const filename = uuid();
 		const tmpFileName = path.join( os.tmpdir(), filename + '.png' );
 		fs.copyFileSync( testImagePath, tmpFileName );

packages/e2e-tests/specs/adding-inline-tokens.test.js → packages/e2e-tests/specs/editor/various/adding-inline-tokens.test.js

@@ -33,7 +33,7 @@ describe( 'adding inline tokens', () => {
 		// Wait for media modal to appear and upload image.
 		await page.waitForSelector( '.media-modal input[type=file]' );
 		const inputElement = await page.$( '.media-modal input[type=file]' );
-		const testImagePath = path.join( __dirname, '..', 'assets', '10x10_e2e_test_image_z9T8jK.png' );
+		const testImagePath = path.join( __dirname, '..', '..', '..', 'assets', '10x10_e2e_test_image_z9T8jK.png' );
 		const filename = uuid();
 		const tmpFileName = path.join( os.tmpdir(), filename + '.png' );
 		fs.copyFileSync( testImagePath, tmpFileName );

packages/e2e-tests/specs/manage-reusable-blocks.test.js → packages/e2e-tests/specs/editor/various/manage-reusable-blocks.test.js

@@ -32,7 +32,7 @@ describe( 'Managing reusable blocks', () => {
 		await importButton.click();
 
 		// Select the file to upload
-		const testReusableBlockFile = path.join( __dirname, '..', 'assets', 'greeting-reusable-block.json' );
+		const testReusableBlockFile = path.join( __dirname, '..', '..', '..', 'assets', 'greeting-reusable-block.json' );
 		const input = await page.$( '.list-reusable-blocks-import-form input' );
 		await input.uploadFile( testReusableBlockFile );
 

packages/e2e-tests/specs/block-transforms.test.js → packages/e2e-tests/specs/experimental/block-transforms.test.js

@@ -32,8 +32,8 @@ import {
 	getAvailableBlockFixturesBasenames,
 	getBlockFixtureHTML,
 	getBlockFixtureParsedJSON,
-} from '../fixtures/';
-import { EXPECTED_TRANSFORMS } from '../fixtures/block-transforms.js';
+} from '../../fixtures/';
+import { EXPECTED_TRANSFORMS } from '../../fixtures/block-transforms.js';
 
 /*
 * Returns true if the fileBase refers to a fixture of a block