From f7dd0ae55225d5e084f26c1d4cbda2c4d7173571 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 6 Mar 2019 09:56:29 +0100 Subject: [PATCH 1/2] Revert "Disable fragile tests for now" This reverts commit 40e04c83914e960b5aff739900d887f0e7a44d63. --- .../acceptance/features/app-comments.feature | 2 +- tests/acceptance/features/login.feature | 2 +- tests/acceptance/features/users.feature | 28 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/acceptance/features/app-comments.feature b/tests/acceptance/features/app-comments.feature index b57883d8ba8e3..4fb948ea6faaf 100644 --- a/tests/acceptance/features/app-comments.feature +++ b/tests/acceptance/features/app-comments.feature @@ -16,7 +16,7 @@ Feature: app-comments # And I see a comment with "Hello world" as message # When I open the details view for "Folder" # The "Comments" tab should already be opened -# Then I see that there are no comments + Then I see that there are no comments Scenario: write a comment in a file right after writing a comment in another file Given I am logged in diff --git a/tests/acceptance/features/login.feature b/tests/acceptance/features/login.feature index 8d5bacb18c07a..047d7398d6cf7 100644 --- a/tests/acceptance/features/login.feature +++ b/tests/acceptance/features/login.feature @@ -47,7 +47,7 @@ Feature: login And I see that the list of users contains the user unknownUser And I act as John And I log in with user unknownUser and password 123456acb -# Then I see that the current page is the Files app + Then I see that the current page is the Files app Scenario: log out Given I am logged in diff --git a/tests/acceptance/features/users.feature b/tests/acceptance/features/users.feature index c4cfa3b69bf85..7c25121d40958 100644 --- a/tests/acceptance/features/users.feature +++ b/tests/acceptance/features/users.feature @@ -20,7 +20,7 @@ Feature: users And I set the password for the new user to "123456acb" And I create the new user Then I see that the list of users contains the user "test" -# And I see that the display name for the user "test" is "Test display name" + And I see that the display name for the user "test" is "Test display name" Scenario: delete a user Given I act as Jane @@ -28,9 +28,9 @@ Feature: users And I open the User settings And I see that the list of users contains the user user0 And I open the actions menu for the user user0 -# And I see that the "Delete user" action in the user0 actions menu is shown -# When I click the "Delete user" action in the user0 actions menu -# Then I see that the list of users does not contains the user user0 + And I see that the "Delete user" action in the user0 actions menu is shown + When I click the "Delete user" action in the user0 actions menu + Then I see that the list of users does not contains the user user0 Scenario: disable a user Given I act as Jane @@ -38,11 +38,11 @@ Feature: users And I open the User settings And I see that the list of users contains the user user0 And I open the actions menu for the user user0 -# And I see that the "Disable user" action in the user0 actions menu is shown -# When I click the "Disable user" action in the user0 actions menu -# Then I see that the list of users does not contains the user user0 -# When I open the "Disabled users" section -# Then I see that the list of users contains the user user0 + And I see that the "Disable user" action in the user0 actions menu is shown + When I click the "Disable user" action in the user0 actions menu + Then I see that the list of users does not contains the user user0 + When I open the "Disabled users" section + Then I see that the list of users contains the user user0 Scenario: users navigation without disabled users Given I act as Jane @@ -51,12 +51,12 @@ Feature: users And I open the "Disabled users" section And I see that the list of users contains the user disabledUser And I open the actions menu for the user disabledUser -# And I see that the "Enable user" action in the disabledUser actions menu is shown -# When I click the "Enable user" action in the disabledUser actions menu -# Then I see that the section "Disabled users" is not shown + And I see that the "Enable user" action in the disabledUser actions menu is shown + When I click the "Enable user" action in the disabledUser actions menu + Then I see that the section "Disabled users" is not shown # check again after reloading the settings -# When I open the User settings -# Then I see that the section "Disabled users" is not shown + When I open the User settings + Then I see that the section "Disabled users" is not shown Scenario: assign user to a group Given I act as Jane From 4c9c4cf8bd314089d68cce4dc778f96cd3afd7cd Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 21 Jul 2020 13:52:09 +0200 Subject: [PATCH 2/2] Displayname is not inside an input field anymore - adjust the acceptance test Signed-off-by: Morris Jobke --- tests/acceptance/features/bootstrap/UsersSettingsContext.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/acceptance/features/bootstrap/UsersSettingsContext.php b/tests/acceptance/features/bootstrap/UsersSettingsContext.php index 020da46612826..8a605fa90c0c5 100644 --- a/tests/acceptance/features/bootstrap/UsersSettingsContext.php +++ b/tests/acceptance/features/bootstrap/UsersSettingsContext.php @@ -108,7 +108,7 @@ public static function inputForUserInCell($cell, $user) { * @return Locator */ public static function displayNameCellForUser($user) { - return self::inputForUserInCell("displayName", $user); + return self::classCellForUser("displayName", $user); } /**