From 154071c1bc1effcba159cff27a46a890f50b0d0f Mon Sep 17 00:00:00 2001 From: Ilyas Foo Date: Fri, 21 May 2021 09:13:40 +0800 Subject: [PATCH] Revert copy for setup checklist (https://github.com/woocommerce/woocommerce-admin/pull/7015) * Revert copy for index.js and tasks.js * Update changelog * Update test * Update tests * Update tests again * Lint --- plugins/woocommerce-admin/client/header/index.js | 2 +- .../woocommerce-admin/client/header/test/index.js | 4 +--- .../woocommerce-admin/client/task-list/index.js | 5 +---- .../woocommerce-admin/client/task-list/tasks.js | 14 +++++++------- .../client/task-list/test/index.js | 4 ++-- plugins/woocommerce-admin/readme.txt | 1 + .../tests/e2e/constants/taskTitles.ts | 2 +- .../tests/e2e/pages/PaymentsSetup.ts | 2 +- .../tests/e2e/pages/WcHomescreen.ts | 2 +- .../tests/e2e/specs/tasks/payment.test.ts | 2 +- 10 files changed, 17 insertions(+), 21 deletions(-) diff --git a/plugins/woocommerce-admin/client/header/index.js b/plugins/woocommerce-admin/client/header/index.js index f5280eefd90..a7dffdb5e57 100644 --- a/plugins/woocommerce-admin/client/header/index.js +++ b/plugins/woocommerce-admin/client/header/index.js @@ -67,7 +67,7 @@ const getPageTitle = ( defaultTitle ) => { // If it's the task list then render a title based on which task the user is on. return ( { - payments: __( 'Choose payment methods', 'woocommerce-admin' ), + payments: __( 'Set up payments', 'woocommerce-admin' ), tax: __( 'Add tax rates', 'woocommerce-admin' ), appearance: __( 'Personalize your store', 'woocommerce-admin' ), products: __( 'Add products', 'woocommerce-admin' ), diff --git a/plugins/woocommerce-admin/client/header/test/index.js b/plugins/woocommerce-admin/client/header/test/index.js index 1e8b90111fe..5d842a3e650 100644 --- a/plugins/woocommerce-admin/client/header/test/index.js +++ b/plugins/woocommerce-admin/client/header/test/index.js @@ -86,9 +86,7 @@ describe( 'Header', () => { queryByTestId( 'header-back-button' ) ).not.toBeEmptyDOMElement(); - expect( - queryByText( 'Choose payment methods' ) - ).not.toBeEmptyDOMElement(); + expect( queryByText( 'Set up payments' ) ).not.toBeEmptyDOMElement(); } ); it( 'should render decoded breadcrumb name', () => { diff --git a/plugins/woocommerce-admin/client/task-list/index.js b/plugins/woocommerce-admin/client/task-list/index.js index 1709de6b87e..c7f2106274d 100644 --- a/plugins/woocommerce-admin/client/task-list/index.js +++ b/plugins/woocommerce-admin/client/task-list/index.js @@ -203,10 +203,7 @@ const TaskDashboard = ( { userPreferences, query } ) => { isComplete={ isTaskListComplete } query={ query } tasks={ setupTasks } - title={ __( - 'Get ready to start selling', - 'woocommerce-admin' - ) } + title={ __( 'Finish setup', 'woocommerce-admin' ) } trackedCompletedTasks={ trackedCompletedTasks || [] } /> ) } diff --git a/plugins/woocommerce-admin/client/task-list/tasks.js b/plugins/woocommerce-admin/client/task-list/tasks.js index e484667dc80..8cd0acbfd38 100644 --- a/plugins/woocommerce-admin/client/task-list/tasks.js +++ b/plugins/woocommerce-admin/client/task-list/tasks.js @@ -95,14 +95,14 @@ export function getAllTasks( { ).includes( 'woocommerce-payments' ); let purchaseAndInstallText = __( - 'Add paid extensions to your store', + 'Add paid extensions to my store', 'woocommerce-admin' ); if ( uniqueItemsList.length === 1 ) { const { name: itemName } = uniqueItemsList[ 0 ]; const purchaseAndInstallFormat = __( - 'Add %s to your store', + 'Add %s to my store', 'woocommerce-admin' ); purchaseAndInstallText = sprintf( purchaseAndInstallFormat, itemName ); @@ -138,7 +138,7 @@ export function getAllTasks( { }, { key: 'products', - title: __( 'Add products', 'woocommerce-admin' ), + title: __( 'Add my products', 'woocommerce-admin' ), container: , onClick: () => { onTaskSelect( 'products' ); @@ -195,7 +195,7 @@ export function getAllTasks( { }, { key: 'payments', - title: __( 'Choose payment methods', 'woocommerce-admin' ), + title: __( 'Set up payments', 'woocommerce-admin' ), container: , completed: hasPaymentGateway, onClick: () => { @@ -211,7 +211,7 @@ export function getAllTasks( { }, { key: 'tax', - title: __( 'Add tax rates', 'woocommerce-admin' ), + title: __( 'Set up tax', 'woocommerce-admin' ), container: , onClick: () => { onTaskSelect( 'tax' ); @@ -224,7 +224,7 @@ export function getAllTasks( { }, { key: 'shipping', - title: __( 'Set up shipping costs', 'woocommerce-admin' ), + title: __( 'Set up shipping', 'woocommerce-admin' ), container: , onClick: () => { if ( shippingZonesCount > 0 ) { @@ -246,7 +246,7 @@ export function getAllTasks( { }, { key: 'appearance', - title: __( 'Personalize your store', 'woocommerce-admin' ), + title: __( 'Personalize my store', 'woocommerce-admin' ), container: , onClick: () => { onTaskSelect( 'appearance' ); diff --git a/plugins/woocommerce-admin/client/task-list/test/index.js b/plugins/woocommerce-admin/client/task-list/test/index.js index 0ccb8e55f25..50960ebf280 100644 --- a/plugins/woocommerce-admin/client/task-list/test/index.js +++ b/plugins/woocommerce-admin/client/task-list/test/index.js @@ -39,7 +39,7 @@ jest.mock( '@wordpress/data', () => ( { useDispatch: jest.fn(), } ) ); -const TASK_LIST_HEADING = 'Get ready to start selling'; +const TASK_LIST_HEADING = 'Finish setup'; const EXTENDED_TASK_LIST_HEADING = 'Things to do next'; describe( 'TaskDashboard and TaskList', () => { @@ -144,7 +144,7 @@ describe( 'TaskDashboard and TaskList', () => { type: 'extension', }; - it( 'renders the "Get ready to start selling" and "Things to do next" tasks lists', async () => { + it( 'renders the "Finish setup" and "Things to do next" tasks lists', async () => { apiFetch.mockResolvedValue( {} ); getAllTasks.mockReturnValue( tasks ); const { container } = render( ); diff --git a/plugins/woocommerce-admin/readme.txt b/plugins/woocommerce-admin/readme.txt index 06f7c6e278d..ea4297ff757 100644 --- a/plugins/woocommerce-admin/readme.txt +++ b/plugins/woocommerce-admin/readme.txt @@ -113,6 +113,7 @@ Release and roadmap notes are available on the [WooCommerce Developers Blog](htt - Fix: Call existing filters for leaderboards in analytics. #6626 - Fix: Set target to blank for the external links #6999 - Tweak: Only fetch remote payment gateway recommendations when opted in #6964 +- Tweak: Setup checklist copy revert. #7015 - Tweak: Store profiler - Changed MailPoet's title and description #6990 - Update: Task list component with new Experimental Task list. #6849 - Update: Experimental task list import to the experimental package. #6950 diff --git a/plugins/woocommerce-admin/tests/e2e/constants/taskTitles.ts b/plugins/woocommerce-admin/tests/e2e/constants/taskTitles.ts index 14bd5dc0c2d..e272df4a030 100644 --- a/plugins/woocommerce-admin/tests/e2e/constants/taskTitles.ts +++ b/plugins/woocommerce-admin/tests/e2e/constants/taskTitles.ts @@ -1,6 +1,6 @@ export const TaskTitles = { storeDetails: 'Store details', - addPayments: 'Choose payment methods', + addPayments: 'Set up payments', wooPayments: 'Set up WooCommerce PaymentsBy setting up, you are agreeing to the Terms of Service2 minutes', addProducts: 'Add products', diff --git a/plugins/woocommerce-admin/tests/e2e/pages/PaymentsSetup.ts b/plugins/woocommerce-admin/tests/e2e/pages/PaymentsSetup.ts index 35c3795ddd7..2a58189782b 100644 --- a/plugins/woocommerce-admin/tests/e2e/pages/PaymentsSetup.ts +++ b/plugins/woocommerce-admin/tests/e2e/pages/PaymentsSetup.ts @@ -19,7 +19,7 @@ export class PaymentsSetup extends BasePage { url = 'wp-admin/admin.php?page=wc-admin&task=payments'; async isDisplayed() { - await waitForElementByText( 'h1', 'Choose payment methods' ); + await waitForElementByText( 'h1', 'Set up payments' ); } async closeHelpModal() { diff --git a/plugins/woocommerce-admin/tests/e2e/pages/WcHomescreen.ts b/plugins/woocommerce-admin/tests/e2e/pages/WcHomescreen.ts index e55f646219c..e642ecd544d 100644 --- a/plugins/woocommerce-admin/tests/e2e/pages/WcHomescreen.ts +++ b/plugins/woocommerce-admin/tests/e2e/pages/WcHomescreen.ts @@ -27,7 +27,7 @@ export class WcHomescreen extends BasePage { await page.waitForSelector( '.woocommerce-task-card .woocommerce-task-list__item-title' ); - await waitForElementByText( 'p', 'Get ready to start selling' ); + await waitForElementByText( 'p', 'Finish setup' ); const list = await this.page.$$eval( '.woocommerce-task-card .woocommerce-task-list__item-title', ( items ) => items.map( ( item ) => item.textContent ) diff --git a/plugins/woocommerce-admin/tests/e2e/specs/tasks/payment.test.ts b/plugins/woocommerce-admin/tests/e2e/specs/tasks/payment.test.ts index 7ff7851f00c..571c2be60aa 100644 --- a/plugins/woocommerce-admin/tests/e2e/specs/tasks/payment.test.ts +++ b/plugins/woocommerce-admin/tests/e2e/specs/tasks/payment.test.ts @@ -33,7 +33,7 @@ describe( 'Payment setup task', () => { } ); it( 'Can visit the payment setup task from the homescreen if the setup wizard has been skipped', async () => { - await homeScreen.clickOnTaskList( 'Choose payment methods' ); + await homeScreen.clickOnTaskList( 'Set up payments' ); await paymentsSetup.closeHelpModal(); await paymentsSetup.isDisplayed(); } );