From a4da14b6539ec51573b71def05643c7db0743c03 Mon Sep 17 00:00:00 2001 From: adrianpawlak Date: Tue, 14 Oct 2025 16:19:16 +0200 Subject: [PATCH 1/3] Added options to disable Help Center as default & update secrets --- .github/workflows/browser-tests.yaml | 8 ++++++-- .../BrowserContext/UserPreferencesContext.php | 10 ++++++++++ src/lib/Behat/Page/UserSettingsPage.php | 18 ++++++++++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/.github/workflows/browser-tests.yaml b/.github/workflows/browser-tests.yaml index 8103284d94..9b0708a2d4 100644 --- a/.github/workflows/browser-tests.yaml +++ b/.github/workflows/browser-tests.yaml @@ -27,7 +27,8 @@ jobs: test-suite: '--profile=browser --suite=admin-ui-full --tags=@IbexaHeadless' test-setup-phase-1: '--profile=setup --suite=personas --mode=standard' test-setup-phase-2: '--profile=setup --suite=content-translation --mode=standard' - job-count: 2 + test-setup-phase-3: '--profile=setup --suite=user-settings --mode=standard' + job-count: 3 timeout: 40 secrets: inherit admin-ui-experience-commerce: @@ -38,7 +39,8 @@ jobs: test-suite: '--profile=browser --suite=admin-ui-full --tags=@IbexaExperience,@IbexaCommerce' test-setup-phase-1: '--profile=setup --suite=personas --mode=standard' test-setup-phase-2: '--profile=setup --suite=content-translation --mode=standard' - job-count: 2 + test-setup-phase-3: '--profile=setup --suite=user-settings --mode=standard' + job-count: 3 timeout: 40 secrets: inherit page-builder: @@ -48,5 +50,7 @@ jobs: project-edition: 'experience' test-suite: '--profile=browser --suite=personas' test-setup-phase-1: '--profile=setup --suite=personas --tags=@setup --mode=standard' + test-setup-phase-2: '--profile=setup --suite=user-settings --mode=standard' + job-count: 2 timeout: 40 secrets: inherit diff --git a/src/lib/Behat/BrowserContext/UserPreferencesContext.php b/src/lib/Behat/BrowserContext/UserPreferencesContext.php index 0bfa8da7cd..03e6715c45 100644 --- a/src/lib/Behat/BrowserContext/UserPreferencesContext.php +++ b/src/lib/Behat/BrowserContext/UserPreferencesContext.php @@ -59,4 +59,14 @@ public function iSetAutosaveDraftValue(): void $this->userSettingsPage->verifyIsLoaded(); $this->userSettingsPage->disableAutosave(); } + + /** + * @Given I disable Help center + */ + public function iDisableHelpCenter(): void + { + $this->userSettingsPage->openBrowsingEditionPage(); + $this->userSettingsPage->verifyIsLoaded(); + $this->userSettingsPage->disableHelpCenter(); + } } diff --git a/src/lib/Behat/Page/UserSettingsPage.php b/src/lib/Behat/Page/UserSettingsPage.php index f8516f18ea..0aab9a2c34 100644 --- a/src/lib/Behat/Page/UserSettingsPage.php +++ b/src/lib/Behat/Page/UserSettingsPage.php @@ -60,6 +60,7 @@ protected function specifyLocators(): array new VisibleCSSLocator('title', '.ibexa-edit-header__title,.ibexa-page-title__content'), new VisibleCSSLocator('autosaveDraftValueDropdown', '#user_setting_update_autosave div.ibexa-dropdown__wrapper > ul'), new VisibleCSSLocator('autosaveIntervalEdit', '#user_setting_update_autosave_interval_value'), + new VisibleCSSLocator('helpCenterValueDropdown', '#user_setting_update_help_center div.ibexa-dropdown__wrapper > ul'), ]; } @@ -94,4 +95,21 @@ public function getName(): string { return 'User settings'; } + + public function openBrowsingEditionPage(): void + { + $this->getHTMLPage() + ->findAll(new VisibleCSSLocator('settingsSection', '#ibexa-tab-my-preferences .ibexa-details')) + ->getByCriterion(new ChildElementTextCriterion(new VisibleCSSLocator('settingHeader', '.ibexa-table-header__headline'), 'Browsing')) + ->find(new VisibleCSSLocator('editButton', ' .ibexa-btn__label')) + ->assert()->textEquals('Edit') + ->click(); + } + + public function disableHelpCenter(): void + { + $this->contentActionsMenu->verifyIsLoaded(); + $this->getHTMLPage()->find($this->getLocator('autosaveDraftValueDropdown'))->click(); + $this->ibexaDropdown->selectOption('Disabled'); + } } From c03cf3bd431e0033e2cbc36433e31211b27903e0 Mon Sep 17 00:00:00 2001 From: adrianpawlak Date: Wed, 15 Oct 2025 09:51:32 +0200 Subject: [PATCH 2/3] Fix locators --- src/lib/Behat/Page/UserSettingsPage.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/Behat/Page/UserSettingsPage.php b/src/lib/Behat/Page/UserSettingsPage.php index 0aab9a2c34..fbcf7bcb06 100644 --- a/src/lib/Behat/Page/UserSettingsPage.php +++ b/src/lib/Behat/Page/UserSettingsPage.php @@ -37,7 +37,7 @@ public function __construct(Session $session, Router $router, ContentActionsMenu public function verifyIsLoaded(): void { $pageHeaderText = $this->getHTMLPage()->find($this->getLocator('title'))->getText(); - Assert::AssertContains($pageHeaderText, ['User settings', 'Content authoring']); + Assert::AssertContains($pageHeaderText, ['User settings', 'Content authoring', 'Browsing']); } public function switchTab(string $tabName): void @@ -109,7 +109,7 @@ public function openBrowsingEditionPage(): void public function disableHelpCenter(): void { $this->contentActionsMenu->verifyIsLoaded(); - $this->getHTMLPage()->find($this->getLocator('autosaveDraftValueDropdown'))->click(); + $this->getHTMLPage()->find($this->getLocator('helpCenterValueDropdown'))->click(); $this->ibexaDropdown->selectOption('Disabled'); } } From 7a7f005b13aaf0feb05011fe299f263e3670187c Mon Sep 17 00:00:00 2001 From: adrianpawlak Date: Wed, 15 Oct 2025 15:51:40 +0200 Subject: [PATCH 3/3] revert browser-tests.yaml --- .github/workflows/browser-tests.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/browser-tests.yaml b/.github/workflows/browser-tests.yaml index 9b0708a2d4..8103284d94 100644 --- a/.github/workflows/browser-tests.yaml +++ b/.github/workflows/browser-tests.yaml @@ -27,8 +27,7 @@ jobs: test-suite: '--profile=browser --suite=admin-ui-full --tags=@IbexaHeadless' test-setup-phase-1: '--profile=setup --suite=personas --mode=standard' test-setup-phase-2: '--profile=setup --suite=content-translation --mode=standard' - test-setup-phase-3: '--profile=setup --suite=user-settings --mode=standard' - job-count: 3 + job-count: 2 timeout: 40 secrets: inherit admin-ui-experience-commerce: @@ -39,8 +38,7 @@ jobs: test-suite: '--profile=browser --suite=admin-ui-full --tags=@IbexaExperience,@IbexaCommerce' test-setup-phase-1: '--profile=setup --suite=personas --mode=standard' test-setup-phase-2: '--profile=setup --suite=content-translation --mode=standard' - test-setup-phase-3: '--profile=setup --suite=user-settings --mode=standard' - job-count: 3 + job-count: 2 timeout: 40 secrets: inherit page-builder: @@ -50,7 +48,5 @@ jobs: project-edition: 'experience' test-suite: '--profile=browser --suite=personas' test-setup-phase-1: '--profile=setup --suite=personas --tags=@setup --mode=standard' - test-setup-phase-2: '--profile=setup --suite=user-settings --mode=standard' - job-count: 2 timeout: 40 secrets: inherit