Merge commit 'a94a442d9a4cf40cb3cc68e08e172ccba1304bd2' into interact…

…ivity-api-new-store-api

tests/e2e/tests/checkout/checkout-block.merchant.block_theme.spec.ts

@@ -0,0 +1,117 @@
+/**
+ * External dependencies
+ */
+import { BlockData } from '@woocommerce/e2e-types';
+import { test, expect } from '@woocommerce/e2e-playwright-utils';
+
+const blockData: BlockData = {
+	name: 'Checkout',
+	slug: 'woocommerce/checkout',
+	mainClass: '.wp-block-woocommerce-checkout',
+	selectors: {
+		editor: {
+			block: '.wp-block-woocommerce-checkout',
+			insertButton: "//button//span[text()='Checkout']",
+		},
+		frontend: {},
+	},
+};
+
+test.describe( 'Merchant → Checkout', () => {
+	// `as string` is safe here because we know the variable is a string, it is defined above.
+	const blockSelectorInEditor = blockData.selectors.editor.block as string;
+
+	test.describe( 'in page editor', () => {
+		test.beforeEach( async ( { editorUtils, admin, editor } ) => {
+			await admin.visitSiteEditor( {
+				postId: 'woocommerce/woocommerce//page-checkout',
+				postType: 'wp_template',
+			} );
+			await editorUtils.waitForSiteEditorFinishLoading();
+			await editorUtils.enterEditMode();
+			await editor.openDocumentSettingsSidebar();
+		} );
+
+		test( 'renders without crashing and can only be inserted once', async ( {
+			page,
+			editorUtils,
+		} ) => {
+			const blockPresence = await editorUtils.getBlockByName(
+				blockData.slug
+			);
+			expect( blockPresence ).toBeTruthy();
+
+			await editorUtils.openGlobalBlockInserter();
+			await page.getByPlaceholder( 'Search' ).fill( blockData.slug );
+			const checkoutBlockButton = page.getByRole( 'option', {
+				name: blockData.name,
+				exact: true,
+			} );
+			await expect( checkoutBlockButton ).toHaveAttribute(
+				'aria-disabled',
+				'true'
+			);
+		} );
+
+		test( 'toggling shipping company hides and shows address field', async ( {
+			editor,
+		} ) => {
+			await editor.selectBlocks(
+				blockSelectorInEditor +
+					'  [data-type="woocommerce/checkout-shipping-address-block"]'
+			);
+			const checkbox = editor.page.getByRole( 'checkbox', {
+				name: 'Company',
+				exact: true,
+			} );
+			await checkbox.check();
+			await expect( checkbox ).toBeChecked();
+			await expect(
+				editor.canvas.locator(
+					'div.wc-block-components-address-form__company'
+				)
+			).toBeVisible();
+
+			await checkbox.uncheck();
+			await expect( checkbox ).not.toBeChecked();
+			await expect(
+				editor.canvas.locator(
+					'.wc-block-checkout__shipping-fields .wc-block-components-address-form__company'
+				)
+			).toBeHidden();
+		} );
+
+		test( 'toggling billing company hides and shows address field', async ( {
+			editor,
+		} ) => {
+			await editor.canvas.click( 'body' );
+			await editor.canvas
+				.getByLabel( 'Use same address for billing' )
+				.uncheck();
+
+			await editor.selectBlocks(
+				blockSelectorInEditor +
+					'  [data-type="woocommerce/checkout-billing-address-block"]'
+			);
+			const checkbox = editor.page.getByRole( 'checkbox', {
+				name: 'Company',
+				exact: true,
+			} );
+			await checkbox.check();
+			await expect( checkbox ).toBeChecked();
+			await expect(
+				editor.canvas.locator(
+					'.wc-block-checkout__billing-fields .wc-block-components-address-form__company'
+				)
+			).toBeVisible();
+
+			await checkbox.uncheck();
+			await expect( checkbox ).not.toBeChecked();
+			await expect(
+				editor.canvas.locator(
+					'div.wc-block-components-address-form__company'
+				)
+			).toBeHidden();
+		} );
+	} );
+} );

tests/e2e/utils/editor/editor-utils.page.ts

@@ -220,8 +220,13 @@ export class EditorUtils {
 			.first()
 			.waitFor();
 		await this.page
-			.locator( '.edit-site-canvas-spinner' )
-			.waitFor( { state: 'hidden' } );
+			// Spinner was used instead of the progress bar in an earlier version of
+			// the site editor.
+			.locator( '.edit-site-canvas-loader, .edit-site-canvas-spinner' )
+			// Bigger timeout is needed for larger entities, for example the large
+			// post html fixture that we load for performance tests, which often
+			// doesn't make it under the default 10 seconds.
+			.waitFor( { state: 'hidden', timeout: 60_000 } );
 	}
 
 	async setLayoutOption(