diff --git a/admin/tool/policy/tests/behat/acceptances.feature b/admin/tool/policy/tests/behat/acceptances.feature index ed2748079e5..72babfef66a 100644 --- a/admin/tool/policy/tests/behat/acceptances.feature +++ b/admin/tool/policy/tests/behat/acceptances.feature @@ -34,13 +34,13 @@ Feature: Viewing acceptances reports and accepting on behalf of other users Then I should see "This site policy" And I should not see "Course overview" And I press "Next" - And I set the field "I agree to the This site policy" to "1" + And I set the field "I agree to the This site policy." to "1" And I press "Next" And I should see "Calendar" And I log out And I log in as "manager" And I press "Next" - And I set the field "I agree to the This site policy" to "1" + And I set the field "I agree to the This site policy." to "1" And I press "Next" And I navigate to "Users > Privacy and policies > User agreements" in site administration And "Accepted" "text" should exist in the "User One" "table_row" @@ -53,7 +53,7 @@ Feature: Viewing acceptances reports and accepting on behalf of other users | tool/policy:acceptbehalf | allow | When I log in as "manager" And I press "Next" - And I set the field "I agree to the This site policy" to "1" + And I set the field "I agree to the This site policy." to "1" And I press "Next" And I navigate to "Users > Privacy and policies > Manage policies" in site administration And I click on "1 of 4 (25%)" "link" in the "This site policy" "table_row" @@ -76,7 +76,7 @@ Feature: Viewing acceptances reports and accepting on behalf of other users | tool/policy:acceptbehalf | allow | When I log in as "manager" And I press "Next" - And I set the field "I agree to the This site policy" to "1" + And I set the field "I agree to the This site policy." to "1" And I press "Next" And I should see "Calendar" And I navigate to "Users > Privacy and policies > Manage policies" in site administration @@ -104,16 +104,16 @@ Feature: Viewing acceptances reports and accepting on behalf of other users And I press "Next" And I should see "This privacy policy" And I press "Next" - And I set the field "I agree to the This site policy" to "1" - And I set the field "I agree to the This privacy policy" to "1" + And I set the field "I agree to the This site policy." to "1" + And I set the field "I agree to the This privacy policy." to "1" And I press "Next" And I should see "Calendar" And I log out And I log in as "manager" And I press "Next" And I press "Next" - And I set the field "I agree to the This site policy" to "1" - And I set the field "I agree to the This privacy policy" to "1" + And I set the field "I agree to the This site policy." to "1" + And I set the field "I agree to the This privacy policy." to "1" And I press "Next" And I navigate to "Users > Privacy and policies > User agreements" in site administration And "Accepted" "text" should exist in the "User One" "table_row" @@ -142,8 +142,8 @@ Feature: Viewing acceptances reports and accepting on behalf of other users When I log in as "manager" And I press "Next" And I press "Next" - And I set the field "I agree to the This site policy" to "1" - And I set the field "I agree to the This privacy policy" to "1" + And I set the field "I agree to the This site policy." to "1" + And I set the field "I agree to the This privacy policy." to "1" And I press "Next" And I navigate to "Users > Privacy and policies > User agreements" in site administration And I click on "Accept This site policy" "link" in the "User One" "table_row" @@ -176,8 +176,8 @@ Feature: Viewing acceptances reports and accepting on behalf of other users When I log in as "manager" And I press "Next" And I press "Next" - And I set the field "I agree to the This site policy" to "1" - And I set the field "I agree to the This privacy policy" to "1" + And I set the field "I agree to the This site policy." to "1" + And I set the field "I agree to the This privacy policy." to "1" And I press "Next" And I navigate to "Users > Privacy and policies > User agreements" in site administration And I click on "Accept This site policy" "link" in the "User One" "table_row" @@ -198,7 +198,7 @@ Feature: Viewing acceptances reports and accepting on behalf of other users Scenario: Policies and agreements profile link visible for current user Given I log in as "user1" And I press "Next" - And I set the field "I agree to the This site policy" to "1" + And I set the field "I agree to the This site policy." to "1" And I press "Next" When I follow "Profile" in the user menu # User can see his own agreements link in the profile. @@ -217,7 +217,7 @@ Feature: Viewing acceptances reports and accepting on behalf of other users | tool/policy:acceptbehalf | allow | And I log in as "manager" And I press "Next" - And I set the field "I agree to the This site policy" to "1" + And I set the field "I agree to the This site policy." to "1" And I press "Next" # User can see agreements link in other user profiles because has the capability for accepting on behalf of them. When I am on "Course1" course homepage @@ -231,7 +231,7 @@ Feature: Viewing acceptances reports and accepting on behalf of other users | tool/policy:acceptbehalf | allow | When I log in as "manager" And I press "Next" - And I set the field "I agree to the This site policy" to "1" + And I set the field "I agree to the This site policy." to "1" And I press "Next" And I log out And I am on the "manager" "user > profile" page logged in as "admin" @@ -267,8 +267,8 @@ Feature: Viewing acceptances reports and accepting on behalf of other users When I log in as "manager" And I press "Next" And I press "Next" - And I set the field "I agree to the This site policy" to "1" - And I set the field "I agree to the This privacy policy" to "1" + And I set the field "I agree to the This site policy." to "1" + And I set the field "I agree to the This privacy policy." to "1" And I press "Next" And I navigate to "Users > Privacy and policies > User agreements" in site administration And I click on "Select" "checkbox" in the "User One" "table_row" @@ -290,7 +290,7 @@ Feature: Viewing acceptances reports and accepting on behalf of other users And I should see "This site policy" And I should not see "Course overview" And I press "Next" - And I set the field "I agree to the This site policy" to "1" + And I set the field "I agree to the This site policy." to "1" And I press "Next" And I should see "Calendar" And I log out diff --git a/admin/tool/policy/tests/behat/consent.feature b/admin/tool/policy/tests/behat/consent.feature index 06da24e4c4a..d58230a409b 100644 --- a/admin/tool/policy/tests/behat/consent.feature +++ b/admin/tool/policy/tests/behat/consent.feature @@ -85,11 +85,11 @@ Feature: User must accept policy managed by this plugin when logging in and sign And I should see "short text2" And I should see "full text2" And I press "Next" - And I should see "Please agree to the following policies" + And I should see "Please agree to the following policies:" And I should see "This site policy" in the "region-main" "region" And I should see "short text2" And I should not see "full text2" - And I set the field "I agree to the This site policy" to "1" + And I set the field "I agree to the This site policy." to "1" And I press "Next" And I should not see "I understand and agree" And I set the following fields to these values: @@ -137,7 +137,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign And I should see "short text3" And I should see "full text3" And I press "Next" - And I should see "Please agree to the following policies" + And I should see "Please agree to the following policies:" And I should see "This site policy" in the "region-main" "region" And I should see "short text2" And I should not see "full text2" @@ -147,8 +147,8 @@ Feature: User must accept policy managed by this plugin when logging in and sign And I should not see "This guests policy" in the "region-main" "region" And I should not see "short text4" And I should not see "full text4" - And I set the field "I agree to the This site policy" to "1" - And I set the field "I agree to the This privacy policy" to "1" + And I set the field "I agree to the This site policy." to "1" + And I set the field "I agree to the This privacy policy." to "1" And I press "Next" And I should not see "I understand and agree" And I set the following fields to these values: @@ -197,11 +197,11 @@ Feature: User must accept policy managed by this plugin when logging in and sign And I should see "short text2" And I should see "full text2" And I press "Next" - And I should see "Please agree to the following policies" + And I should see "Please agree to the following policies:" And I should see "This site policy" And I should see "short text2" And I should not see "full text2" - And I set the field "I agree to the This site policy" to "1" + And I set the field "I agree to the This site policy." to "1" And I press "Next" And I should not see "I understand and agree" And I set the following fields to these values: @@ -244,19 +244,19 @@ Feature: User must accept policy managed by this plugin when logging in and sign And I press "Next" And I should see "This privacy policy" And I press "Next" - And I should see "Please agree to the following policies" + And I should see "Please agree to the following policies:" And I should see "This site policy" And I should see "This privacy policy" # Confirm that a notification is displayed if none of the policies are accepted. - When I set the field "I agree to the This site policy" to "0" - And I set the field "I agree to the This privacy policy" to "0" + When I set the field "I agree to the This site policy." to "0" + And I set the field "I agree to the This privacy policy." to "0" And I press "Next" - Then I should see "Please agree to the following policies" + Then I should see "Please agree to the following policies:" And I should see "Before continuing you need to acknowledge all these policies." # Confirm that a notification is displayed if only some policies are accepted. - When I set the field "I agree to the This site policy" to "1" - And I set the field "I agree to the This privacy policy" to "0" - Then I should see "Please agree to the following policies" + When I set the field "I agree to the This site policy." to "1" + And I set the field "I agree to the This privacy policy." to "0" + Then I should see "Please agree to the following policies:" And I should see "Before continuing you need to acknowledge all these policies." Scenario: Accept policy on login, do not accept all policies @@ -276,23 +276,23 @@ Feature: User must accept policy managed by this plugin when logging in and sign And I press "Next" And I should see "This privacy policy" And I press "Next" - And I should see "Please agree to the following policies" + And I should see "Please agree to the following policies:" And I should see "This site policy" And I should see "This privacy policy" # Confirm that a notification is displayed if none of the policies are accepted. - When I set the field "I agree to the This site policy" to "0" - And I set the field "I agree to the This privacy policy" to "0" + When I set the field "I agree to the This site policy." to "0" + And I set the field "I agree to the This privacy policy." to "0" And I press "Next" - Then I should see "Please agree to the following policies" + Then I should see "Please agree to the following policies:" And I should see "Before continuing you need to acknowledge all these policies." # Confirm that a notification is displayed if only some policies are accepted. - When I set the field "I agree to the This site policy" to "1" - And I set the field "I agree to the This privacy policy" to "0" - Then I should see "Please agree to the following policies" + When I set the field "I agree to the This site policy." to "1" + And I set the field "I agree to the This privacy policy." to "0" + Then I should see "Please agree to the following policies:" And I should see "Before continuing you need to acknowledge all these policies." # Confirm that user can not browse the site (edit their profile). When I follow "Profile" in the user menu - Then I should see "Please agree to the following policies" + Then I should see "Please agree to the following policies:" Scenario: Accept policy on login, accept all policies Given the following config values are set as admin: @@ -311,14 +311,14 @@ Feature: User must accept policy managed by this plugin when logging in and sign And I press "Next" And I should see "This privacy policy" And I press "Next" - And I should see "Please agree to the following policies" + And I should see "Please agree to the following policies:" And I should see "This site policy" And I should see "This privacy policy" # User accepts all policies. - When I set the field "I agree to the This site policy" to "1" - And I set the field "I agree to the This privacy policy" to "1" + When I set the field "I agree to the This site policy." to "1" + And I set the field "I agree to the This privacy policy." to "1" And I press "Next" - Then I should not see "Please agree to the following policies" + Then I should not see "Please agree to the following policies:" And I should not see "Before continuing you need to acknowledge all these policies." # Confirm that user can login and browse the site (edit their profile). When I open my profile in edit mode @@ -328,7 +328,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign When I log in as "user1" Then I should not see "This site policy" And I should not see "This privacy policy" - And I should not see "Please agree to the following policies" + And I should not see "Please agree to the following policies:" # Confirm that user can login and browse the site (edit their profile). When I open my profile in edit mode Then the field "First name" matches value "User" @@ -350,14 +350,14 @@ Feature: User must accept policy managed by this plugin when logging in and sign And I press "Next" And I should see "This privacy policy" And I press "Next" - And I should see "Please agree to the following policies" + And I should see "Please agree to the following policies:" And I should see "This site policy" And I should see "This privacy policy" # User accepts all policies. - When I set the field "I agree to the This site policy" to "1" - And I set the field "I agree to the This privacy policy" to "1" + When I set the field "I agree to the This site policy." to "1" + And I set the field "I agree to the This privacy policy." to "1" And I press "Next" - Then I should not see "Please agree to the following policies" + Then I should not see "Please agree to the following policies:" # Confirm that user can login and browse the site (edit their profile). When I open my profile in edit mode Then the field "First name" matches value "User" @@ -385,7 +385,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign And I should not see "This privacy policy" Then I should see "This third parties policy" And I press "Next" - And I should see "Please agree to the following policies" + And I should see "Please agree to the following policies:" And I should see "This third parties policy" And I set the field "This third parties policy" to "1" And I press "Next" @@ -407,12 +407,12 @@ Feature: User must accept policy managed by this plugin when logging in and sign And I log in as "user1" And I should see "This site policy" And I press "Next" - And I should see "Please agree to the following policies" + And I should see "Please agree to the following policies:" And I should see "This site policy" # User accepts policy. - When I set the field "I agree to the This site policy" to "1" + When I set the field "I agree to the This site policy." to "1" And I press "Next" - Then I should not see "Please agree to the following policies" + Then I should not see "Please agree to the following policies:" # Confirm that user can login and browse the site (edit their profile). When I open my profile in edit mode Then the field "First name" matches value "User" @@ -437,13 +437,13 @@ Feature: User must accept policy managed by this plugin when logging in and sign And I should see "short text2 new version" And I should see "full text2 new version" When I press "Next" - Then I should see "Please agree to the following policies" + Then I should see "Please agree to the following policies:" And I should see "This site policy new version" And I should see "short text2 new version" # User accepts policy. - And I set the field "I agree to the This site policy new version" to "1" + And I set the field "I agree to the This site policy new version." to "1" When I press "Next" - Then I should not see "Please agree to the following policies" + Then I should not see "Please agree to the following policies:" # Confirm that user can login and browse the site (edit their profile). When I open my profile in edit mode Then the field "First name" matches value "User" @@ -504,15 +504,15 @@ Feature: User must accept policy managed by this plugin when logging in and sign And I should see "short text3" And I should see "full text3" When I press "Next" - Then I should see "Please agree to the following policies" + Then I should see "Please agree to the following policies:" And I should see "This site policy" in the "region-main" "region" And I should see "short text2" And I should see "This privacy policy" in the "region-main" "region" And I should see "short text3" And I should not see "This guests policy" in the "region-main" "region" And I should not see "short text4" - And I set the field "I agree to the This site policy" to "1" - And I set the field "I agree to the This privacy policy" to "1" + And I set the field "I agree to the This site policy." to "1" + And I set the field "I agree to the This privacy policy." to "1" When I press "Next" Then I should not see "I understand and agree" And I should see "New account" @@ -537,7 +537,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign And I should see "short text3" And I should see "full text3" When I press "Next" - Then I should see "Please agree to the following policies" + Then I should see "Please agree to the following policies:" And I should see "This site policy" in the "region-main" "region" And I should see "short text2" And I should not see "full text2" @@ -547,8 +547,8 @@ Feature: User must accept policy managed by this plugin when logging in and sign And I should not see "This guests policy" in the "region-main" "region" And I should not see "short text4" And I should not see "full text4" - And I set the field "I agree to the This site policy" to "1" - And I set the field "I agree to the This privacy policy" to "1" + And I set the field "I agree to the This site policy." to "1" + And I set the field "I agree to the This privacy policy." to "1" When I press "Next" Then I should not see "I understand and agree" And I should see "New account" @@ -572,8 +572,8 @@ Feature: User must accept policy managed by this plugin when logging in and sign And I should see "Please read our This privacy policy" And I press "Next" And I should see "Viewing this page on behalf of User 1" - And I set the field "I agree to the This site policy" to "1" - And I set the field "I agree to the This privacy policy" to "1" + And I set the field "I agree to the This site policy." to "1" + And I set the field "I agree to the This privacy policy." to "1" And I press "Next" And I log out And I log in as "user1" @@ -599,15 +599,15 @@ Feature: User must accept policy managed by this plugin when logging in and sign When I log in as "manager" And I press "Next" And I press "Next" - And I set the field "I agree to the This site policy" to "1" - And I set the field "I agree to the This privacy policy" to "1" + And I set the field "I agree to the This site policy." to "1" + And I set the field "I agree to the This privacy policy." to "1" And I press "Next" And I am on the "user1" "user > profile" page And I follow "Log in as" Then I should see "You are logged in as User 1" And I press "Continue" And I should see "Policies and agreements" - And I should see "No permission to agree to the policies on behalf of this user" + And I should see "No permission to agree to the policies on behalf of this user." And I should see "Sorry, you do not have the required permission to agree to the following policies on behalf of User 1" Scenario: Accept policy on sign up as a guest, one policy @@ -631,11 +631,11 @@ Feature: User must accept policy managed by this plugin when logging in and sign And I should see "short text2" And I should see "full text2" And I press "Next" - And I should see "Please agree to the following policies" + And I should see "Please agree to the following policies:" And I should see "This site policy" And I should see "short text2" And I should not see "full text2" - And I set the field "I agree to the This site policy" to "1" + And I set the field "I agree to the This site policy." to "1" And I press "Next" And I should not see "I understand and agree" And I set the following fields to these values: @@ -680,12 +680,12 @@ Feature: User must accept policy managed by this plugin when logging in and sign Then I should see "Digital maturity declaration" in the "region-main" "region" And I should see "You declare be old enough" And I should see "Here goes content." - And I press "I agree to the Digital maturity declaration" + And I press "I agree to the Digital maturity declaration." # The second policy with the agreement style "on its own page" must be accepted now. And I should see "Terms of Service" in the "region-main" "region" And I should see "We teach, you learn" And I should see "Here goes content." - And I press "I agree to the Terms of Service" + And I press "I agree to the Terms of Service." # Only now we see the remaining consent page policies. And I should see "Policy 1 out of 2" And I should see "Privacy policy" in the "region-main" "region" @@ -697,14 +697,14 @@ Feature: User must accept policy managed by this plugin when logging in and sign And I should see "We eat cookies, srsly" And I should see "Here goes content." And I press "Next" - And I should see "Please agree to the following policies" + And I should see "Please agree to the following policies:" And I should see "Privacy policy" And I should see "Cookies policy" And I should not see "Digital maturity declaration" in the "region-main" "region" And I should not see "Terms of Service" in the "region-main" "region" And I should not see "Here goes content." - And I set the field "I agree to the Privacy policy" to "1" - And I set the field "I agree to the Cookies policy" to "1" + And I set the field "I agree to the Privacy policy." to "1" + And I set the field "I agree to the Cookies policy." to "1" And I press "Next" And I should see "New account" And I set the following fields to these values: @@ -751,7 +751,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign Then I should see "Digital maturity declaration" in the "region-main" "region" And I should see "You declare be old enough" And I should see "Here goes content." - And I press "I agree to the Digital maturity declaration" + And I press "I agree to the Digital maturity declaration." # The second policy with the agreement style "on its own page" must be accepted now. And I should see "Terms of Service" in the "region-main" "region" And I should see "We teach, you learn" @@ -762,7 +762,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign And I should see "Terms of Service" in the "region-main" "region" And I should see "We teach, you learn" And I should see "Here goes content." - And I press "I agree to the Terms of Service" + And I press "I agree to the Terms of Service." # Only now we see the remaining consent page policies. And I should see "Policy 1 out of 2" And I should see "Privacy policy" in the "region-main" "region" @@ -774,14 +774,14 @@ Feature: User must accept policy managed by this plugin when logging in and sign And I should see "We eat cookies, srsly" And I should see "Here goes content." And I press "Next" - And I should see "Please agree to the following policies" + And I should see "Please agree to the following policies:" And I should see "Privacy policy" And I should see "Cookies policy" And I should not see "Digital maturity declaration" in the "region-main" "region" And I should not see "Terms of Service" in the "region-main" "region" And I should not see "Here goes content." - And I set the field "I agree to the Privacy policy" to "1" - And I set the field "I agree to the Cookies policy" to "1" + And I set the field "I agree to the Privacy policy." to "1" + And I set the field "I agree to the Cookies policy." to "1" And I press "Next" And I follow "Profile" in the user menu # User can see his own agreements in the profile. @@ -809,15 +809,15 @@ Feature: User must accept policy managed by this plugin when logging in and sign Then I should see "Privacy policy" in the "region-main" "region" And I should see "We scan your thoughts" And I should see "Here goes content." - And I press "I agree to the Privacy policy" + And I press "I agree to the Privacy policy." And I should see "Digital maturity declaration" in the "region-main" "region" And I should see "You declare be old enough" And I should see "Here goes content." - And I press "I agree to the Digital maturity declaration" + And I press "I agree to the Digital maturity declaration." And I should see "Terms of Service" in the "region-main" "region" And I should see "We teach, you learn" And I should see "Here goes content." - And I press "I agree to the Terms of Service" + And I press "I agree to the Terms of Service." And I follow "Profile" in the user menu And I follow "Policies and agreements" And "Accepted" "text" should exist in the "Privacy policy" "table_row" @@ -844,10 +844,10 @@ Feature: User must accept policy managed by this plugin when logging in and sign Then I should see "Digital maturity declaration" in the "region-main" "region" And I should see "You declare be old enough" And I should see "Here goes content." - And I press "I agree to the Digital maturity declaration" + And I press "I agree to the Digital maturity declaration." And I should see "Cookies policy" in the "region-main" "region" And I should see "We eat cookies, srsly" - And I press "I agree to the Cookies policy" + And I press "I agree to the Cookies policy." And I should see "New account" And I set the following fields to these values: | Username | user1 | diff --git a/admin/tool/policy/tests/behat/managepolicies.feature b/admin/tool/policy/tests/behat/managepolicies.feature index 60cf7a74bf2..757ec1a85b3 100644 --- a/admin/tool/policy/tests/behat/managepolicies.feature +++ b/admin/tool/policy/tests/behat/managepolicies.feature @@ -61,7 +61,7 @@ Feature: Manage policies | Policy1 | v1 | full text2 | short text2 | active | And I log in as "manager" And I press "Next" - And I set the field "I agree to the Policy1" to "1" + And I set the field "I agree to the Policy1." to "1" And I press "Next" And I navigate to "Users > Privacy and policies > Manage policies" in site administration And I click on "Edit" "link" in the "Policy1" "table_row" @@ -83,7 +83,7 @@ Feature: Manage policies | Policy1 | v1 | full text2 | short text2 | active | And I log in as "manager" And I press "Next" - And I set the field "I agree to the Policy1" to "1" + And I set the field "I agree to the Policy1." to "1" And I press "Next" And I navigate to "Users > Privacy and policies > Manage policies" in site administration And I click on "Edit" "link" in the "Policy1" "table_row" @@ -101,7 +101,7 @@ Feature: Manage policies | Policy1 | v1 | full text2 | short text2 | active | And I log in as "manager" And I press "Next" - And I set the field "I agree to the Policy1" to "1" + And I set the field "I agree to the Policy1." to "1" And I press "Next" And I navigate to "Users > Privacy and policies > Manage policies" in site administration And I click on "Edit" "link" in the "Policy1" "table_row" @@ -180,7 +180,7 @@ Feature: Manage policies | Policy1 | v1 | full text2 | short text2 | active | And I log in as "manager" And I press "Next" - And I set the field "I agree to the Policy1" to "1" + And I set the field "I agree to the Policy1." to "1" And I press "Next" And I navigate to "Users > Privacy and policies > Manage policies" in site administration And I click on "Set status to \"Inactive\"" "link" in the "Policy1" "table_row" @@ -218,7 +218,7 @@ Feature: Manage policies | Policy1 | v1 | full text2 | short text2 | active | And I log in as "manager" And I press "Next" - And I set the field "I agree to the Policy1" to "1" + And I set the field "I agree to the Policy1." to "1" And I press "Next" And I navigate to "Users > Privacy and policies > Manage policies" in site administration And I click on "Set status to \"Inactive\"" "link" in the "Policy1" "table_row" @@ -247,7 +247,7 @@ Feature: Manage policies | Policy1 | v1 | full text2 | short text2 | active | And I log in as "user1" And I press "Next" - And I set the field "I agree to the Policy1" to "1" + And I set the field "I agree to the Policy1." to "1" And I press "Next" And I follow "Preferences" in the user menu And I should see "Preferences" diff --git a/admin/tool/policy/tests/behat/optional.feature b/admin/tool/policy/tests/behat/optional.feature index 374ad922dec..9fe5a22a01c 100644 --- a/admin/tool/policy/tests/behat/optional.feature +++ b/admin/tool/policy/tests/behat/optional.feature @@ -70,14 +70,14 @@ Feature: Optional policies And I should see "OwnPageCompulsory1" in the "region-main" "region" And I should see "short text4" in the "region-main" "region" And I should see "full text4" in the "region-main" "region" - And I press "I agree to the OwnPageCompulsory1" + And I press "I agree to the OwnPageCompulsory1." # Compulsory policies displayed on the consent page are shown next and must be agreed. And I should see "ConsentPageCompulsory1" And I should see "short text3" in the "region-main" "region" And I should see "full text3" in the "region-main" "region" And I press "Next" - And I should see "Please agree to the following policies" - And I set the field "I agree to the ConsentPageCompulsory1" to "1" + And I should see "Please agree to the following policies:" + And I set the field "I agree to the ConsentPageCompulsory1." to "1" And I press "Next" # The signup form can be submitted and a new account created. And I set the following fields to these values: @@ -99,7 +99,7 @@ Feature: Optional policies Then I should see "OwnPageOptional1" And I should see "short text5" in the "region-main" "region" And I should see "full text5" in the "region-main" "region" - And I press "No thanks, I decline OwnPageOptional1" + And I press "I don't agree to the OwnPageOptional1" # Then come policies displayed on the consent page. And I should see "ConsentPageOptional1" in the "region-main" "region" And I should see "short text1" in the "region-main" "region" @@ -109,9 +109,9 @@ Feature: Optional policies And I should see "short text2" in the "region-main" "region" And I should see "full text2" in the "region-main" "region" And I press "Next" - And I should see "Please agree to the following policies" - And I set the field "I agree to the ConsentPageOptional1" to "1" - And I set the field "No thanks, I decline ConsentPageOptional2" to "0" + And I should see "Please agree to the following policies:" + And I set the field "I agree to the ConsentPageOptional1." to "1" + And I set the field "I don't agree to the ConsentPageOptional2" to "0" And I press "Next" # Accepted and declined policies are shown in the profile. And I follow "Profile" in the user menu @@ -132,14 +132,14 @@ Feature: Optional policies Then I should see "OwnPageOptional1" And I should see "short text5" in the "region-main" "region" And I should see "full text5" in the "region-main" "region" - And I press "I agree to the OwnPageOptional1" + And I press "I agree to the OwnPageOptional1." # Then come policies displayed on the consent page. And I should see "ConsentPageOptional1" in the "region-main" "region" And I should see "short text1" in the "region-main" "region" And I should see "full text1" in the "region-main" "region" And I press "Next" - And I should see "Please agree to the following policies" - And I set the field "No thanks, I decline ConsentPageOptional1" to "0" + And I should see "Please agree to the following policies:" + And I set the field "I don't agree to the ConsentPageOptional1" to "0" And I press "Next" # Accepted and declined policies are shown in the profile. And I follow "Profile" in the user menu @@ -152,7 +152,7 @@ Feature: Optional policies | Name | Content | Summary | Agreementstyle | Optional | | OwnPageOptional1 | full text1 | short text1 | 1 | 1 | And I log in as "user1" - And I press "I agree to the OwnPageOptional1" + And I press "I agree to the OwnPageOptional1." And I follow "Profile" in the user menu And I follow "Policies and agreements" And "Accepted" "text" should exist in the "OwnPageOptional1" "table_row" @@ -177,7 +177,7 @@ Feature: Optional policies | Name | Content | Summary | Agreementstyle | Optional | | OwnPageOptional1 | full text1 | short text1 | 1 | 1 | And I log in as "user1" - And I press "I agree to the OwnPageOptional1" + And I press "I agree to the OwnPageOptional1." And I follow "Profile" in the user menu And I follow "Policies and agreements" And "Accepted" "text" should exist in the "OwnPageOptional1" "table_row" @@ -202,12 +202,12 @@ Feature: Optional policies | OwnPageOptional1 | full text1 | short text1 | 1 | 1 | | OwnPageOptional2 | full text2 | short text2 | 1 | 1 | And I log in as "user1" - And I press "I agree to the OwnPageOptional1" - And I press "No thanks, I decline OwnPageOptional2" + And I press "I agree to the OwnPageOptional1." + And I press "I don't agree to the OwnPageOptional2" And I log out And I log in as "manager" - And I press "I agree to the OwnPageOptional1" - And I press "I agree to the OwnPageOptional2" + And I press "I agree to the OwnPageOptional1." + And I press "I agree to the OwnPageOptional2." When I navigate to "Users > Privacy and policies > User agreements" in site administration # User One has accepted just some policies. Then "Partially accepted" "text" should exist in the "User One" "table_row" @@ -228,8 +228,8 @@ Feature: Optional policies | OwnPageOptional1 | full text1 | short text1 | 1 | 1 | | OwnPageOptional2 | full text2 | short text2 | 1 | 1 | And I log in as "user1" - And I press "I agree to the OwnPageOptional1" - And I press "No thanks, I decline OwnPageOptional2" + And I press "I agree to the OwnPageOptional1." + And I press "I don't agree to the OwnPageOptional2" And I log out And I log in as "admin" When I navigate to "Users > Privacy and policies > User agreements" in site administration