diff --git a/tests/features/varbase/step1-init-tests/01-create-default-testing-users.feature b/tests/features/varbase/step1-init-tests/01-create-default-testing-users.feature
index 0f8cccfa3258822726e35a8ca097fa3ae44a04ff..fbd3d3a15fd489fc276d795dcb874ecfe87f23ab 100644
--- a/tests/features/varbase/step1-init-tests/01-create-default-testing-users.feature
+++ b/tests/features/varbase/step1-init-tests/01-create-default-testing-users.feature
@@ -10,152 +10,85 @@ Feature: Create default testing users.
Background:
Given I am a logged in user with the "webmaster" user
- @javascript @init @tools @local @development @staging
+ @init @tools @local @development @staging
Scenario: Create the test_authenticated user.
When I go to "/admin/people/create"
And I wait
Then I should see "Add user"
When I fill in "authenticated.test@vardot.com" for "Email address"
And I fill in "test_authenticated" for "Username"
+ And I fill in "dD.123123ddd" for "Password"
+ And I fill in "dD.123123ddd" for "Confirm password"
And I press "Create new account"
And I wait
Then I should see "Created a new user account"
- @javascript @init @tools @local @development @staging
- Scenario: Set a password for the test_authenticated user.
- When I go to "/admin/people"
- And I wait
- And I fill in "test_authenticated" for "Name or email contains"
- And I press "Filter"
- And I wait
- Then I should see "test_authenticated"
- When I click "Edit" in the "test_authenticated" row
- Then I should see "test_authenticated"
- When I fill in "dD.123123ddd" for "Password"
- And I fill in "dD.123123ddd" for "Confirm password"
- And I press "Save"
- And I wait
- Then I should see "The changes have been saved."
-
- @javascript @init @tools @local @development @staging
+ @init @tools @local @development @staging
Scenario: Create the test_editor user.
When I go to "/admin/people/create"
And I wait
Then I should see "Add user"
- When I check "Editor"
- And I fill in "editor.test@vardot.com" for "Email address"
+ When I fill in "editor.test@vardot.com" for "Email address"
And I fill in "test_editor" for "Username"
+ And I fill in "dD.123123ddd" for "Password"
+ And I fill in "dD.123123ddd" for "Confirm password"
+ And I check the box "Editor"
And I press "Create new account"
And I wait
Then I should see "Created a new user account"
- @javascript @init @tools @local @development @staging
- Scenario: Set a password for the test_editor user.
- When I go to "/admin/people"
- And I wait
- And I fill in "test_editor" for "Name or email contains"
- And I press "Filter"
- And I wait
- Then I should see "test_editor"
- When I click "Edit" in the "test_editor" row
- Then I should see "test_editor"
- When I fill in "dD.123123ddd" for "Password"
- And I fill in "dD.123123ddd" for "Confirm password"
- And I press "Save"
- And I wait
- Then I should see "The changes have been saved."
-
- @javascript @init @tools @local @development @staging
+ @init @tools @local @development @staging
Scenario: Create the test_content_admin user.
When I go to "/admin/people/create"
And I wait
Then I should see "Add user"
- When I check "Content Admin"
- And I fill in "content.admin.test@vardot.com" for "Email address"
+ When I fill in "content.admin.test@vardot.com" for "Email address"
And I fill in "test_content_admin" for "Username"
+ And I fill in "dD.123123ddd" for "Password"
+ And I fill in "dD.123123ddd" for "Confirm password"
+ And I check the box "Content Admin"
And I press "Create new account"
And I wait
Then I should see "Created a new user account"
- @javascript @init @tools @local @development @staging
- Scenario: Set a password for the test_content_admin user.
- When I go to "/admin/people"
- And I wait
- And I fill in "test_content_admin" for "Name or email contains"
- And I press "Filter"
- And I wait
- Then I should see "test_content_admin"
- When I click "Edit" in the "test_content_admin" row
- Then I should see "test_content_admin"
- When I fill in "dD.123123ddd" for "Password"
- And I fill in "dD.123123ddd" for "Confirm password"
- And I press "Save"
- And I wait
- Then I should see "The changes have been saved."
-
- @javascript @init @tools @local @development @staging
+ @init @tools @local @development @staging
Scenario: Create the test_seo_admin user.
When I go to "/admin/people/create"
And I wait
- When I check "SEO Admin"
- And I fill in "seo.admin.test@vardot.com" for "Email address"
+ Then I should see "Add user"
+ When I fill in "seo.admin.test@vardot.com" for "Email address"
And I fill in "test_seo_admin" for "Username"
+ And I fill in "dD.123123ddd" for "Password"
+ And I fill in "dD.123123ddd" for "Confirm password"
+ And I check the box "SEO Admin"
And I press "Create new account"
And I wait
Then I should see "Created a new user account"
- @javascript @init @tools @local @development @staging
- Scenario: Set a password for the test_seo_admin user.
- When I go to "/admin/people"
- And I wait
- And I fill in "test_seo_admin" for "Name or email contains"
- And I press "Filter"
- And I wait
- Then I should see "test_seo_admin"
- When I click "Edit" in the "test_seo_admin" row
- Then I should see "test_seo_admin"
- When I fill in "dD.123123ddd" for "Password"
- And I fill in "dD.123123ddd" for "Confirm password"
- And I press "Save"
- And I wait
- Then I should see "The changes have been saved."
-
- @javascript @init @tools @local @development @staging
+ @init @tools @local @development @staging
Scenario: Create the test_site_admin user.
When I go to "/admin/people/create"
And I wait
Then I should see "Add user"
- When I check "Site Admin"
- And I fill in "site.admin.test@vardot.com" for "Email address"
+ When I fill in "site.admin.test@vardot.com" for "Email address"
And I fill in "test_site_admin" for "Username"
+ And I fill in "dD.123123ddd" for "Password"
+ And I fill in "dD.123123ddd" for "Confirm password"
+ And I check the box "Site Admin"
And I press "Create new account"
And I wait
Then I should see "Created a new user account"
- @javascript @init @tools @local @development @staging
- Scenario: Set a password for the test_site_admin user.
- When I go to "/admin/people"
- And I wait
- And I fill in "test_site_admin" for "Name or email contains"
- And I press "Filter"
- And I wait
- Then I should see "test_site_admin"
- When I click "Edit" in the "test_site_admin" row
- Then I should see "test_site_admin"
- When I fill in "dD.123123ddd" for "Password"
- And I fill in "dD.123123ddd" for "Confirm password"
- And I press "Save"
- And I wait
- Then I should see "The changes have been saved."
-
- @javascript @init @tools @local @development @staging
+ @init @tools @local @development @staging
Scenario: Create the test_super_admin user.
When I go to "/admin/people/create"
And I wait
Then I should see "Add user"
- When I check "Super Admin"
- And I fill in "super.admin.test@vardot.com" for "Email address"
+ When I fill in "super.admin.test@vardot.com" for "Email address"
And I fill in "test_super_admin" for "Username"
+ And I fill in "dD.123123ddd" for "Password"
+ And I fill in "dD.123123ddd" for "Confirm password"
+ And I check the box "Super Admin"
And I press "Create new account"
And I wait
Then I should see "Created a new user account"
diff --git a/tests/features/varbase/step2-apply-tests/02-user-management/02-02-admins-can-create-users-and-assign-role-them.feature b/tests/features/varbase/step2-apply-tests/02-user-management/02-02-admins-can-create-users-and-assign-role-them.feature
index 079ca0a0c14105ba801acb8e28c8e56741c1ee1b..e5b007c8237b6107176e4b88325eb4c11d111ab2 100644
--- a/tests/features/varbase/step2-apply-tests/02-user-management/02-02-admins-can-create-users-and-assign-role-them.feature
+++ b/tests/features/varbase/step2-apply-tests/02-user-management/02-02-admins-can-create-users-and-assign-role-them.feature
@@ -14,32 +14,14 @@ So that they will be able to use the site.
And I should see "Username"
And I should see "Email address"
- @javascript @init @tools @local @development @staging
+ @javascript @local @development @staging @production
Scenario: Check if admins can create a new user account as an (authenticated user).
- When I go to "/admin/people/create"
- And I wait
- Then I should see "Add user"
+ Given I go to "/admin/people/create"
When I fill in "tester@vardot.com" for "Email address"
And I fill in "Tester" for "Username"
- And I press "Create new account"
- And I wait
- Then I should see "Created a new user account"
-
- @javascript @init @tools @local @development @staging
- Scenario: Set a password for the Tester user.
- When I go to "/admin/people"
- And I wait
- And I fill in "Tester" for "Name or email contains"
- And I press "Filter"
- And I wait
- Then I should see "Tester"
- When I click "Edit" in the "Tester" row
- Then I should see "Tester"
- When I fill in "dD.123123ddd" for "Password"
+ And I fill in "dD.123123ddd" for "Password"
And I fill in "dD.123123ddd" for "Confirm password"
- And I press "Save"
- And I wait
- Then I should see "The changes have been saved."
+ And I press "Create new account"
@javascript @cleanup @local @development @staging @production
Scenario: Delete the Tester user.
@@ -55,5 +37,5 @@ So that they will be able to use the site.
Then I should see "Are you sure you want to cancel the account Tester?"
When I select the radio button "Delete the account and its content."
And I press "Cancel account"
- And I wait
+ And I wait 10s
Then I should see "People"