Skip to content

Commit

Permalink
Merge pull request #34688 from owncloud/stable10-method-openAppSettin…
Browse files Browse the repository at this point in the history
…gsMenu

[stable10] Rename openSettingsMenu to openAppSettingsMenu
  • Loading branch information
phil-davis authored Mar 6, 2019
2 parents 678ca0d + ed26c4b commit 0fe36d8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions tests/acceptance/features/bootstrap/WebUIUsersContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ public function theUserReloadsTheUsersPage() {
* @return void
*/
public function theAdminDisablesUserUsingTheWebui($username) {
$this->usersPage->openSettingsMenu();
$this->usersPage->openAppSettingsMenu();
$this->usersPage->setSetting("Show enabled/disabled option");
$this->usersPage->disableUser($username);
}
Expand Down Expand Up @@ -621,7 +621,7 @@ public function theAdministratorRemovesUserFromGroupUsingTheWebui($user, $group)
* @return void
*/
public function theAdministratorChangesTheEmailOfUserToUsingTheWebui($username, $email) {
$this->usersPage->openSettingsMenu();
$this->usersPage->openAppSettingsMenu();
$this->usersPage->setSetting('Show email address');
$this->usersPage->changeUserEmail($this->getSession(), $username, $email);
}
Expand Down
4 changes: 2 additions & 2 deletions tests/acceptance/features/lib/UsersPage.php
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ public function getLastLoginOfUser($username) {
* @throws ElementNotFoundException
* @return void
*/
public function openSettingsMenu() {
public function openAppSettingsMenu() {
$settingsBtn = $this->find("xpath", $this->settingsBtnXpath);
if ($settingsBtn === null) {
throw new ElementNotFoundException(
Expand Down Expand Up @@ -334,7 +334,7 @@ public function setSetting($setting, $value = true) {
}

if (!$settingContentIsVisible) {
$this->openSettingsMenu();
$this->openAppSettingsMenu();
}

$xpathLocator = \sprintf($this->settingByTextXpath, $setting);
Expand Down

0 comments on commit 0fe36d8

Please sign in to comment.