Skip to content

Adapt selectors for new branding #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 6, 2024
Merged

Adapt selectors for new branding #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb4a5da
Fix Makefile test rule for Mac OS
jolelievre Aug 6, 2024
3b235c8
Adapt selectors for new branding
jolelievre Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
.DEFAULT_GOAL := help
5 changes: 4 additions & 1 deletion src/pages/BO/BOBasePage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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';
Expand Down Expand Up @@ -1052,7 +1055,7 @@ export default class BOBasePage extends CommonPage implements BOBasePagePageInte
* @returns {Promise<boolean>}
*/
async closeHelpSideBar(page: Page): Promise<boolean> {
await this.waitForSelectorAndClick(page, this.helpButton);
await this.waitForSelectorAndClick(page, this.closeHelpButton);
return this.elementVisible(page, `${this.rightSidebar}:not(.sidebar-open)`, 2000);
}

Expand Down
2 changes: 1 addition & 1 deletion src/versions/develop/pages/BO/login/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`;
Expand Down