diff --git a/Makefile b/Makefile index 2b4da7cc0..0376bf71b 100644 --- a/Makefile +++ b/Makefile @@ -4,11 +4,11 @@ help: ## Display this help menu check: npm run build -test: ## Build and copy to the dependencies directory for the project - rm dist -rf +test: ## Build and copy to the dependencies directory for the project + rm -rf dist npm run build - rm $(filter-out $@,$(MAKECMDGOALS))/tests/UI/node_modules/@prestashop-core/ui-testing/dist/ -r - cp dist $(filter-out $@,$(MAKECMDGOALS))/tests/UI/node_modules/@prestashop-core/ui-testing/ -r + rm -r $(filter-out $@,$(MAKECMDGOALS))/tests/UI/node_modules/@prestashop-core/ui-testing/dist/ + cp -r dist $(filter-out $@,$(MAKECMDGOALS))/tests/UI/node_modules/@prestashop-core/ui-testing/ cp package.json $(filter-out $@,$(MAKECMDGOALS))/tests/UI/node_modules/@prestashop-core/ui-testing/ -.DEFAULT_GOAL := help \ No newline at end of file +.DEFAULT_GOAL := help diff --git a/src/pages/BO/BOBasePage.ts b/src/pages/BO/BOBasePage.ts index b2185caa8..ff0303506 100644 --- a/src/pages/BO/BOBasePage.ts +++ b/src/pages/BO/BOBasePage.ts @@ -61,6 +61,8 @@ export default class BOBasePage extends CommonPage implements BOBasePagePageInte protected readonly helpButton: string; + protected readonly closeHelpButton: string; + private readonly menuMobileButton: string; private readonly notificationsLink: string; @@ -323,6 +325,7 @@ export default class BOBasePage extends CommonPage implements BOBasePagePageInte // Header links this.helpButton = '#product_form_open_help'; + this.closeHelpButton = '#right-sidebar #ps-quicknav-sidebar .quicknav-header [data-target=".sidebar"]'; this.menuMobileButton = '.js-mobile-menu'; this.notificationsLink = '#notification,#notif'; this.notificationsDropDownMenu = '#notification div.dropdown-menu-right.notifs_dropdown,#notif div.dropdown-menu'; @@ -1052,7 +1055,7 @@ export default class BOBasePage extends CommonPage implements BOBasePagePageInte * @returns {Promise} */ async closeHelpSideBar(page: Page): Promise { - await this.waitForSelectorAndClick(page, this.helpButton); + await this.waitForSelectorAndClick(page, this.closeHelpButton); return this.elementVisible(page, `${this.rightSidebar}:not(.sidebar-open)`, 2000); } diff --git a/src/versions/develop/pages/BO/login/index.ts b/src/versions/develop/pages/BO/login/index.ts index 45525efd2..96ff7c9a2 100644 --- a/src/versions/develop/pages/BO/login/index.ts +++ b/src/versions/develop/pages/BO/login/index.ts @@ -59,7 +59,7 @@ class LoginPage extends BOBasePage implements LoginPageInterface { this.loginBackShopLink = '#login-panel span.login-back-shop'; this.loginFooter = '#login-footer'; - this.allRightsReservedLink = `${this.loginFooter} p.text-center.text-muted a`; + this.allRightsReservedLink = `${this.loginFooter} .text-muted a`; this.twitterLink = `${this.loginFooter} a.link-social.link-twitter`; this.facebookLink = `${this.loginFooter} a.link-social.link-facebook`; this.githubLink = `${this.loginFooter} a.link-social.link-github`;