diff --git a/lib/components/store-sidebar-component.js b/lib/components/store-sidebar-component.js index c4a684097..26ea4839b 100755 --- a/lib/components/store-sidebar-component.js +++ b/lib/components/store-sidebar-component.js @@ -14,7 +14,7 @@ export default class StoreSidebarComponent extends BaseContainer { // this is necessary on mobile width screens displayComponentIfNecessary() { const driver = this.driver; - const mobileLeftArrowSelector = By.css( '.current-section a' ); + const mobileLeftArrowSelector = By.css( '.action-header button' ); driver.findElement( mobileLeftArrowSelector ).isDisplayed().then( ( displayed ) => { if ( displayed === true ) { driverHelper.clickWhenClickable( driver, mobileLeftArrowSelector ); diff --git a/lib/pages/woocommerce/add-edit-product-page.js b/lib/pages/woocommerce/add-edit-product-page.js index 9a25dd13c..586ae0b00 100755 --- a/lib/pages/woocommerce/add-edit-product-page.js +++ b/lib/pages/woocommerce/add-edit-product-page.js @@ -3,6 +3,7 @@ import config from 'config'; import BaseContainer from '../../base-container'; import * as driverHelper from '../../driver-helper'; +import * as driverManager from '../../driver-manager'; import * as dataHelper from '../../data-helper'; export default class AddEditProductPage extends BaseContainer { @@ -65,8 +66,13 @@ export default class AddEditProductPage extends BaseContainer { } deleteProduct() { - driverHelper.clickWhenClickable( this.driver, by.css( '.action-header__actions button.is-scary' ) ); + if ( driverManager.currentScreenSize() === 'mobile' ) { + // open the menu on mobile screens + driverHelper.clickWhenClickable( this.driver, by.css( 'button.split-button__toggle' ) ); + driverHelper.clickWhenClickable( this.driver, by.css( '.popover__menu-item.is-scary' ) ); + } else { + driverHelper.clickWhenClickable( this.driver, by.css( '.action-header__actions button.is-scary' ) ); + } driverHelper.clickWhenClickable( this.driver, by.css( '.dialog__action-buttons button[data-e2e-button="accept"]' ) ); } - } diff --git a/specs-woocommerce/wp-woocommerce-spec.js b/specs-woocommerce/wp-woocommerce-spec.js index 2dcd2108d..7fe2083a2 100755 --- a/specs-woocommerce/wp-woocommerce-spec.js +++ b/specs-woocommerce/wp-woocommerce-spec.js @@ -45,14 +45,14 @@ test.describe( `Can see WooCommerce Store option in Calypso '${ screenSize }' @p this.navBarComponent.clickMySites(); } ); - test.it( 'Can see \'Store (BETA)\' option in main Calypso menu for an AT WooCommerce site set to the US', function() { + test.it( 'Can see \'Store\' option in main Calypso menu for an AT WooCommerce site set to the US', function() { this.sideBarComponent = new SidebarComponent( driver ); this.sideBarComponent.storeOptionDisplayed().then( ( displayed ) => { assert( displayed, 'The Store menu option is not displayed for the AT WooCommerce site set to the US' ); } ); } ); - test.it( 'The \'Store (BETA)\' option opens the store dashboard with its own sidebar', function() { + test.it( 'The \'Store\' option opens the store dashboard with its own sidebar', function() { this.sideBarComponent = new SidebarComponent( driver ); this.sideBarComponent.selectStoreOption(); this.storeDashboardPage = new StoreDashboardPage( driver );