From 5e88e47f58f6b440aa3cf75bbef70c6afac84621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mudr=C3=A1k?= Date: Mon, 31 Mar 2025 21:04:54 +0200 Subject: [PATCH] MDL-84914 lang: Use fixed strings in tests, too --- .../policy/tests/behat/acceptances.feature | 36 ++--- admin/tool/policy/tests/behat/consent.feature | 132 +++++++++--------- .../policy/tests/behat/managepolicies.feature | 12 +- .../tool/policy/tests/behat/optional.feature | 36 ++--- course/tests/behat/course_overview.feature | 4 +- enrol/self/tests/behat/key_holder.feature | 2 +- enrol/self/tests/behat/self_enrolment.feature | 2 +- .../duedate/tests/behat/penalty_rules.feature | 2 +- ...ge_manage_notification_preferences.feature | 8 +- .../tests/behat/overview_report.feature | 2 +- mod/assign/tests/locallib_test.php | 2 +- mod/assign/tests/notification_helper_test.php | 6 +- .../tests/behat/overview_report.feature | 2 +- .../behat/bank_add_default_shared.feature | 6 +- 14 files changed, 126 insertions(+), 126 deletions(-) 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 diff --git a/course/tests/behat/course_overview.feature b/course/tests/behat/course_overview.feature index 16d60bedc02..638609591e2 100644 --- a/course/tests/behat/course_overview.feature +++ b/course/tests/behat/course_overview.feature @@ -24,14 +24,14 @@ Feature: Users can access the course activities overview page Given I am on the "C1" "Course" page logged in as "teacher1" When I follow "Activities" Then I should see "Activities" - And I should see "View all the activities in this course" in the "region-main" "region" + And I should see "An overview of all activities in the course" in the "region-main" "region" And I should see "Assignments" in the "region-main" "region" Scenario: Student can navigate to the course overview page Given I am on the "C1" "Course" page logged in as "student1" When I follow "Activities" Then I should see "Activities" - And I should see "View all the activities in this course" in the "region-main" "region" + And I should see "An overview of all activities in the course" in the "region-main" "region" And I should see "Assignments" in the "region-main" "region" Scenario: The activities overview shows only the type of activities present in the course diff --git a/enrol/self/tests/behat/key_holder.feature b/enrol/self/tests/behat/key_holder.feature index f761c1496b9..87d9276fe88 100644 --- a/enrol/self/tests/behat/key_holder.feature +++ b/enrol/self/tests/behat/key_holder.feature @@ -34,7 +34,7 @@ Feature: Users can be defined as key holders in courses where self enrolment is And I log out And I log in as "student1" And I am on "Course 1" course homepage - And I should see "An enrolment key will be required" + And I should see "An enrolment key will be required." And I press "Enrol me" And I should see "You should have received this enrolment key from:" And I should see "Manager 1" diff --git a/enrol/self/tests/behat/self_enrolment.feature b/enrol/self/tests/behat/self_enrolment.feature index db0617563fb..75c52f3cfef 100644 --- a/enrol/self/tests/behat/self_enrolment.feature +++ b/enrol/self/tests/behat/self_enrolment.feature @@ -51,7 +51,7 @@ Feature: Users can auto-enrol themself in courses where self enrolment is allowe And I log out And I log in as "student1" And I am on "Course 1" course homepage - And I should see "An enrolment key will be required" + And I should see "An enrolment key will be required." And I press "Enrol me" And I set the following fields to these values: | Enrolment key | moodle_rules | diff --git a/grade/penalty/duedate/tests/behat/penalty_rules.feature b/grade/penalty/duedate/tests/behat/penalty_rules.feature index 35f296bd785..528be2ee0f8 100644 --- a/grade/penalty/duedate/tests/behat/penalty_rules.feature +++ b/grade/penalty/duedate/tests/behat/penalty_rules.feature @@ -29,7 +29,7 @@ Feature: As an administrator | overdueby[1][number] | 1 | | penalty[1] | 10 | And I click on "Save changes" "button" - Then I should see "The overdue must be greater than the value of above rule: 1 day. The penalty must be greater than the value of above rule: 10.0%." + Then I should see "The overdue amount must be greater than the amount for the rule above (1 day). The penalty must be greater than the penalty for the rule above (10.0%)." And I set the following fields to these values: | overdueby[1][number] | 2 | | penalty[1] | 20 | diff --git a/message/tests/behat/message_manage_notification_preferences.feature b/message/tests/behat/message_manage_notification_preferences.feature index c833249a305..8d8f7482073 100644 --- a/message/tests/behat/message_manage_notification_preferences.feature +++ b/message/tests/behat/message_manage_notification_preferences.feature @@ -143,14 +143,14 @@ Feature: Manage notification preferences - Email # Open the popover. And I open the notification popover # Confirm the submission notification is NOT visible. - And I should not see "Assignment Submission Confirmation" in the "#nav-notification-popover-container" "css_element" + And I should not see "Assignment submission confirmation" in the "#nav-notification-popover-container" "css_element" And I log in as "student2" # Confirm the popover is showing the unread notifications. Then I should see "1" in the "#nav-notification-popover-container [data-region='count-container']" "css_element" # Open the popover. And I open the notification popover # Confirm the submission notification is visible. - And I should see "Assignment Submission Confirmation" in the "#nav-notification-popover-container" "css_element" + And I should see "Assignment submission confirmation" in the "#nav-notification-popover-container" "css_element" Scenario: User cannot disable forced notification preferences Given the following "courses" exist: @@ -182,7 +182,7 @@ Feature: Manage notification preferences - Email # Open the popover. And I open the notification popover # Confirm the submission notification is visible. - And I should see "Assignment Submission Confirmation" in the "#nav-notification-popover-container" "css_element" + And I should see "Assignment submission confirmation" in the "#nav-notification-popover-container" "css_element" Scenario: User cannot disable disallowed notification preferences Given the following "courses" exist: @@ -214,7 +214,7 @@ Feature: Manage notification preferences - Email # Open the popover. And I open the notification popover # Confirm the submission notification is NOT visible. - And I should not see "Assignment Submission Confirmation" in the "#nav-notification-popover-container" "css_element" + And I should not see "Assignment submission confirmation" in the "#nav-notification-popover-container" "css_element" Scenario: Toggle notification preferences hides/displays options Given I log in as "admin" diff --git a/mod/assign/tests/behat/overview_report.feature b/mod/assign/tests/behat/overview_report.feature index d1e4ca51138..1945284b66f 100644 --- a/mod/assign/tests/behat/overview_report.feature +++ b/mod/assign/tests/behat/overview_report.feature @@ -146,7 +146,7 @@ Feature: Testing overview integration in mod_assign And I am on "Course 1" course homepage with editing mode on And I add the "Activities" block And I click on "Assignments" "link" in the "Activities" "block" - Then I should see "View all the activities in this course" + Then I should see "An overview of all activities in the course" And I should see "Name" in the "assign_overview_collapsible" "region" And I should see "Due date" in the "assign_overview_collapsible" "region" And I should see "Submissions" in the "assign_overview_collapsible" "region" diff --git a/mod/assign/tests/locallib_test.php b/mod/assign/tests/locallib_test.php index 9b850bbbdf9..5928fa3dcf8 100644 --- a/mod/assign/tests/locallib_test.php +++ b/mod/assign/tests/locallib_test.php @@ -1799,7 +1799,7 @@ You can see it appended to your assignment submission:

' . $teachername . ' has posted some feedback on your ' . - 'assignment submission for \'Escaping & Unescaping\'

+ 'assignment submission for \'Escaping & Unescaping\'. You can see it appended to your assignment submission.
', diff --git a/mod/assign/tests/notification_helper_test.php b/mod/assign/tests/notification_helper_test.php index 8675e396084..1858633326d 100644 --- a/mod/assign/tests/notification_helper_test.php +++ b/mod/assign/tests/notification_helper_test.php @@ -832,8 +832,8 @@ final class notification_helper_test extends \advanced_testcase { $message = reset($messages); // Check the subject line and short message. - $this->assertEquals('Assignment Submission Confirmation - Assignment 1', $message->subject); - $this->assertEquals('Assignment Submission Confirmation - Assignment 1', $message->smallmessage); + $this->assertEquals('Assignment submission confirmation - Assignment 1', $message->subject); + $this->assertEquals('Assignment submission confirmation - Assignment 1', $message->smallmessage); // Check the plain text message. $this->assertEquals('A100 -> Assignment -> Assignment 1 @@ -858,7 +858,7 @@ File submissions ', $message->fullmessage); $expectedfragments = [ - '

Your assignment for Assignment 1 has been successfully submitted.

', + '

Your assignment submission for \'Assignment 1\' has been submitted.

', '

You can view your submission and check its status on the assignment page.

', diff --git a/mod/workshop/tests/behat/overview_report.feature b/mod/workshop/tests/behat/overview_report.feature index 204bbcd46b1..efdf7163ac4 100644 --- a/mod/workshop/tests/behat/overview_report.feature +++ b/mod/workshop/tests/behat/overview_report.feature @@ -159,7 +159,7 @@ In order to summarize the workshops And I am on "Course 1" course homepage with editing mode on And I add the "Activities" block And I click on "Workshops" "link" in the "Activities" "block" - Then I should see "View all the activities in this course" + Then I should see "An overview of all activities in the course" And I should see "Name" in the "workshop_overview_collapsible" "region" And I should see "Phase" in the "workshop_overview_collapsible" "region" And I should see "Submissions" in the "workshop_overview_collapsible" "region" diff --git a/question/tests/behat/bank_add_default_shared.feature b/question/tests/behat/bank_add_default_shared.feature index 155d774b6cd..5878ebf99cd 100644 --- a/question/tests/behat/bank_add_default_shared.feature +++ b/question/tests/behat/bank_add_default_shared.feature @@ -18,9 +18,9 @@ Feature: Add a default question bank Scenario: Add a default question bank to a course Given I am on the "C1" "Course" page logged in as "teacher1" When I navigate to "Question banks" in current page administration - Then I should see "This course does not have any question banks yet." + Then I should see "This course doesn't have any question banks yet." And I should see "Add" And I click on "Create default question bank" "button" - But I should not see "This course does not have any question banks yet." - And I should see "Default course question bank created" + But I should not see "This course doesn't have any question banks yet." + And I should see "Default question bank created." And I should see "Course 1 course question bank"