From 862477f9aa65aa2eee01dc83b7d85ed6d53574a5 Mon Sep 17 00:00:00 2001 From: Tung Du Date: Mon, 1 Aug 2022 23:01:57 +0700 Subject: [PATCH] Remove compatibility notice from Mini Cart block (https://github.com/woocommerce/woocommerce-blocks/pull/6803) --- .../assets/js/blocks/mini-cart/edit.tsx | 2 - .../cart-checkout-compatibility-notice.tsx | 2 +- .../tests/e2e/specs/backend/mini-cart.test.js | 60 ------------------- 3 files changed, 1 insertion(+), 63 deletions(-) diff --git a/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/edit.tsx b/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/edit.tsx index f1e744f7a4e..fe181210eee 100644 --- a/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/edit.tsx +++ b/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/edit.tsx @@ -4,7 +4,6 @@ import { InspectorControls, useBlockProps } from '@wordpress/block-editor'; import type { ReactElement } from 'react'; import { formatPrice } from '@woocommerce/price-format'; -import { CartCheckoutCompatibilityNotice } from '@woocommerce/editor-components/compatibility-notices'; import { PanelBody, ExternalLink, SelectControl } from '@wordpress/components'; import { getSetting } from '@woocommerce/settings'; import { __ } from '@wordpress/i18n'; @@ -108,7 +107,6 @@ const Edit = ( { attributes, setAttributes }: Props ): ReactElement => { - ); }; diff --git a/plugins/woocommerce-blocks/assets/js/editor-components/compatibility-notices/cart-checkout-compatibility-notice.tsx b/plugins/woocommerce-blocks/assets/js/editor-components/compatibility-notices/cart-checkout-compatibility-notice.tsx index 69a0ffde2d7..9c71e98fbe3 100644 --- a/plugins/woocommerce-blocks/assets/js/editor-components/compatibility-notices/cart-checkout-compatibility-notice.tsx +++ b/plugins/woocommerce-blocks/assets/js/editor-components/compatibility-notices/cart-checkout-compatibility-notice.tsx @@ -14,7 +14,7 @@ import { useCompatibilityNotice } from './use-compatibility-notice'; import WooImage from './woo-image'; interface CartCheckoutCompatibilityNoticeProps { - blockName: 'cart' | 'checkout' | 'mini-cart'; + blockName: 'cart' | 'checkout'; } export function CartCheckoutCompatibilityNotice( { diff --git a/plugins/woocommerce-blocks/tests/e2e/specs/backend/mini-cart.test.js b/plugins/woocommerce-blocks/tests/e2e/specs/backend/mini-cart.test.js index 73bbe372912..1e496e2f202 100644 --- a/plugins/woocommerce-blocks/tests/e2e/specs/backend/mini-cart.test.js +++ b/plugins/woocommerce-blocks/tests/e2e/specs/backend/mini-cart.test.js @@ -19,7 +19,6 @@ import { goToSiteEditor, useTheme, waitForCanvas, - addBlockToFSEArea, } from '../../utils.js'; const block = { @@ -30,8 +29,6 @@ const block = { insertButton: "//button//span[text()='Mini Cart']", insertButtonDisabled: "//button[@aria-disabled]//span[text()='Mini Cart']", - compatibilityNoticeTitle: - "//h1[contains(text(), 'Compatibility notice')]", }, }; @@ -40,14 +37,6 @@ if ( process.env.WOOCOMMERCE_BLOCKS_PHASE < 3 ) { test.only( `skipping ${ block.name } tests`, () => {} ); } -const removeDismissedCompatibilityNoticesFromLocalStorage = async () => { - await page.evaluate( () => { - window.localStorage.removeItem( - 'wc-blocks_dismissed_compatibility_notices' - ); - } ); -}; - const addBlockToWidgetsArea = async () => { await closeModalIfExists(); await openWidgetsEditorBlockInserter(); @@ -58,10 +47,6 @@ const addBlockToWidgetsArea = async () => { describe( `${ block.name } Block`, () => { describe( 'in widget editor', () => { - beforeAll( async () => { - await removeDismissedCompatibilityNoticesFromLocalStorage(); - } ); - beforeEach( async () => { await openWidgetEditor(); } ); @@ -73,28 +58,6 @@ describe( `${ block.name } Block`, () => { ); } ); - it( 'the compatibility notice appears', async () => { - await addBlockToWidgetsArea(); - const compatibilityNoticeTitle = await page.$x( - block.selectors.compatibilityNoticeTitle - ); - expect( compatibilityNoticeTitle.length ).toBe( 1 ); - } ); - - it( "after the compatibility notice is dismissed, it doesn't appear again", async () => { - await page.evaluate( () => { - window.localStorage.setItem( - 'wc-blocks_dismissed_compatibility_notices', - '["mini-cart"]' - ); - } ); - await addBlockToWidgetsArea(); - const compatibilityNoticeTitle = await page.$x( - block.selectors.compatibilityNoticeTitle - ); - expect( compatibilityNoticeTitle.length ).toBe( 0 ); - } ); - it( 'can only be inserted once', async () => { await addBlockToWidgetsArea(); const miniCartButton = await page.$x( @@ -113,7 +76,6 @@ describe( `${ block.name } Block`, () => { await goToSiteEditor( process.env.GUTENBERG_EDITOR_CONTEXT || 'core' ); - await removeDismissedCompatibilityNoticesFromLocalStorage(); await waitForCanvas(); } ); @@ -122,28 +84,6 @@ describe( `${ block.name } Block`, () => { await expect( canvas() ).toMatchElement( block.class ); } ); - it( 'the compatibility notice appears', async () => { - await addBlockToFSEArea( block.name ); - const compatibilityNoticeTitle = await page.$x( - block.selectors.compatibilityNoticeTitle - ); - expect( compatibilityNoticeTitle.length ).toBe( 1 ); - } ); - - it( "after the compatibility notice is dismissed, it doesn't appear again", async () => { - await page.evaluate( () => { - window.localStorage.setItem( - 'wc-blocks_dismissed_compatibility_notices', - '["mini-cart"]' - ); - } ); - await addBlockToFSEArea( block.name ); - const compatibilityNoticeTitle = await page.$x( - block.selectors.compatibilityNoticeTitle - ); - expect( compatibilityNoticeTitle.length ).toBe( 0 ); - } ); - it( 'can only be inserted once', async () => { await insertBlock( block.name ); await searchForFSEBlock( block.name );