diff options
author | Morris Jobke <hey@morrisjobke.de> | 2020-07-24 01:04:13 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-24 01:04:13 +0200 |
commit | 34c027e44338545ba44f826aed5620355c0f283e (patch) | |
tree | b4dbd51c430bf42020cb01a28ff65df6526c804e /tests/acceptance | |
parent | ce314d948464321bb2fced0941a6345267a40f35 (diff) | |
parent | 5cd5d3c55bd01fbf620293c087feb62661f32382 (diff) | |
download | nextcloud-server-34c027e44338545ba44f826aed5620355c0f283e.tar.gz nextcloud-server-34c027e44338545ba44f826aed5620355c0f283e.zip |
Merge pull request #21940 from nextcloud/fix/14541/fix-fragile-acceptance-tests-part1
Revert "Disable fragile tests for now" partially
Diffstat (limited to 'tests/acceptance')
-rw-r--r-- | tests/acceptance/features/login.feature | 2 | ||||
-rw-r--r-- | tests/acceptance/features/users.feature | 26 |
2 files changed, 14 insertions, 14 deletions
diff --git a/tests/acceptance/features/login.feature b/tests/acceptance/features/login.feature index 8d5bacb18c0..047d7398d6c 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 c4cfa3b69bf..2b6597b7283 100644 --- a/tests/acceptance/features/users.feature +++ b/tests/acceptance/features/users.feature @@ -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 |