diff --git a/features/personas/ChangePassword.feature b/features/personas/ChangePassword.feature index 3714cbedd1..c98d972b12 100644 --- a/features/personas/ChangePassword.feature +++ b/features/personas/ChangePassword.feature @@ -4,7 +4,7 @@ Feature: Verify that an User allowed to change password can change his password Scenario: I can change my password Given I open Login page in admin SiteAccess And I log in as "UserPassword" with password "Passw0rd-42" - When I go to change my password + When I open "Change password" page in admin SiteAccess And I change password from "Passw0rd-42" to "Passw0rd-43" And I click on the edit action bar button "Update" Then success notification that "Your password has been successfully changed." appears diff --git a/src/bundle/Resources/translations/menu.en.xliff b/src/bundle/Resources/translations/menu.en.xliff index 26a032b3be..1c18cbe67c 100644 --- a/src/bundle/Resources/translations/menu.en.xliff +++ b/src/bundle/Resources/translations/menu.en.xliff @@ -401,11 +401,6 @@ Save key: url_wildcard_edit__sidebar_right__save - - Change password - Change password - key: user__change_password - Logout Logout diff --git a/src/lib/Behat/BrowserContext/NavigationContext.php b/src/lib/Behat/BrowserContext/NavigationContext.php index 075ffb6b12..b28734b960 100644 --- a/src/lib/Behat/BrowserContext/NavigationContext.php +++ b/src/lib/Behat/BrowserContext/NavigationContext.php @@ -77,15 +77,6 @@ public function tryToOpenPage(string $pageName): void $this->pageRegistry->get($pageName)->tryToOpen('admin'); } - /** - * @Given I go to change my password - * @Given I go to change my password in user preferences - */ - public function iGoToChangeMyPassword() - { - $this->upperMenu->chooseFromUserDropdown('Change password'); - } - /** * @Then /^I should be on "?([^\"]*)"? page$/ */ diff --git a/src/lib/Behat/Page/ChangePasswordPage.php b/src/lib/Behat/Page/ChangePasswordPage.php index a958b20d89..426deb3119 100644 --- a/src/lib/Behat/Page/ChangePasswordPage.php +++ b/src/lib/Behat/Page/ChangePasswordPage.php @@ -61,6 +61,6 @@ protected function getRoute(): string public function getName(): string { - return 'Change password page'; + return 'Change password'; } } diff --git a/src/lib/EventListener/UserMenuListener.php b/src/lib/EventListener/UserMenuListener.php deleted file mode 100644 index f7f3de7921..0000000000 --- a/src/lib/EventListener/UserMenuListener.php +++ /dev/null @@ -1,76 +0,0 @@ -permissionResolver = $permissionResolver; - $this->userService = $userService; - } - - public static function getSubscribedEvents(): array - { - return [ConfigureMenuEvent::USER_MENU => 'onUserMenuConfigure']; - } - - public function onUserMenuConfigure(ConfigureMenuEvent $event): void - { - $menu = $event->getMenu(); - - $currentUserId = $this->permissionResolver->getCurrentUserReference()->getUserId(); - $currentUser = $this->userService->loadUser($currentUserId); - - if ($this->permissionResolver->canUser('user', 'password', $currentUser, [$currentUser])) { - $menu->addChild( - self::ITEM_CHANGE_PASSWORD, - [ - 'route' => 'ezplatform.user_profile.change_password', - 'extras' => [ - 'translation_domain' => 'menu', - 'orderNumber' => 40, - ], - ] - ); - } - } - - /** - * @return \JMS\TranslationBundle\Model\Message[] - */ - public static function getTranslationMessages(): array - { - return [ - (new Message(self::ITEM_CHANGE_PASSWORD, 'menu'))->setDesc('Change password'), - ]; - } -} - -class_alias(UserMenuListener::class, 'EzSystems\EzPlatformAdminUi\EventListener\UserMenuListener');