From 804f1f5ac784d1f319b906367dc0671d0348cffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mudr=C3=A1k?= Date: Tue, 4 May 2021 13:04:31 +0200 Subject: [PATCH] MDL-71425 lang: Fix reworded strings in tests --- .../tests/behat/block_online_users_frontpage.feature | 10 +++++----- grade/report/user/tests/behat/view_usereport.feature | 2 +- .../tests/behat/view_previous_annotations.feature | 2 +- mod/assign/tests/behat/allow_another_attempt.feature | 4 ++-- mod/assign/tests/behat/edit_previous_feedback.feature | 2 +- mod/assign/tests/behat/grading_status.feature | 4 ++-- mod/assign/tests/behat/group_submission.feature | 2 +- .../tests/behat/reopen_locked_submission.feature | 4 ++-- mod/lesson/tests/behat/lesson_group_override.feature | 4 ++-- mod/lesson/tests/behat/lesson_review.feature | 2 +- mod/lesson/tests/behat/lesson_user_override.feature | 6 +++--- mod/lesson/tests/behat/wrong_answer_continue.feature | 2 +- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/blocks/online_users/tests/behat/block_online_users_frontpage.feature b/blocks/online_users/tests/behat/block_online_users_frontpage.feature index 1f141b09db7..0c08e522fd0 100644 --- a/blocks/online_users/tests/behat/block_online_users_frontpage.feature +++ b/blocks/online_users/tests/behat/block_online_users_frontpage.feature @@ -37,7 +37,7 @@ Feature: The online users block allow you to see who is currently online on fron When I log in as "student1" And I am on site homepage Then I should not see "Admin User" in the "Online users" "block" - And I should see "Other Users (1)" in the "Online users" "block" + And I should see "Other users (1)" in the "Online users" "block" And I should see "Student 1" in the "Online users" "block" And I should see "Student 2" in the "Online users" "block" And I should see "3 online users" in the "Online users" "block" @@ -79,7 +79,7 @@ Feature: The online users block allow you to see who is currently online on fron And I am on site homepage Then I should see "2 online user" in the "Online users" "block" And I should not see "Admin" in the "Online users" "block" - And I should see "Other Users (1)" in the "Online users" "block" + And I should see "Other users (1)" in the "Online users" "block" And I should see "Student 2" in the "Online users" "block" And I should not see "Student 1" in the "Online users" "block" And I log out @@ -94,7 +94,7 @@ Feature: The online users block allow you to see who is currently online on fron And I am on site homepage Then I should see "3 online users" in the "Online users" "block" And I should not see "Admin" in the "Online users" "block" - And I should see "Other Users (1)" in the "Online users" "block" + And I should see "Other users (1)" in the "Online users" "block" And I should see "Student 2" in the "Online users" "block" And I should see "Student 1" in the "Online users" "block" @@ -138,7 +138,7 @@ Feature: The online users block allow you to see who is currently online on fron And I am on site homepage And I should see "2 online user" in the "Online users" "block" And I should not see "Admin" in the "Online users" "block" - And I should see "Other Users (1)" in the "Online users" "block" + And I should see "Other users (1)" in the "Online users" "block" And I should see "Student 2" in the "Online users" "block" And I should not see "Student 1" in the "Online users" "block" And I log out @@ -148,6 +148,6 @@ Feature: The online users block allow you to see who is currently online on fron When I am on site homepage Then I should see "3 online users" in the "Online users" "block" And I should not see "Admin" in the "Online users" "block" - And I should see "Other Users (1)" in the "Online users" "block" + And I should see "Other users (1)" in the "Online users" "block" And I should see "Student 2" in the "Online users" "block" And I should see "Student 1" in the "Online users" "block" diff --git a/grade/report/user/tests/behat/view_usereport.feature b/grade/report/user/tests/behat/view_usereport.feature index 3aaf02aefbc..854b76ae500 100644 --- a/grade/report/user/tests/behat/view_usereport.feature +++ b/grade/report/user/tests/behat/view_usereport.feature @@ -13,4 +13,4 @@ Feature: We can use the user report And I am on "Course 1" course homepage And I navigate to "View > User report" in the course gradebook And I select "All users (0)" from the "Select all or one user" singleselect - Then I should see "No students enrolled in this course yet" + Then I should see "There are no students enrolled in this course." diff --git a/mod/assign/feedback/editpdf/tests/behat/view_previous_annotations.feature b/mod/assign/feedback/editpdf/tests/behat/view_previous_annotations.feature index f86f9baec2f..c86250b9d79 100644 --- a/mod/assign/feedback/editpdf/tests/behat/view_previous_annotations.feature +++ b/mod/assign/feedback/editpdf/tests/behat/view_previous_annotations.feature @@ -25,7 +25,7 @@ Feature: In an assignment, teacher can view the feedback for a previous attempt. | Description | Submit your PDF file | | assignsubmission_file_enabled | 1 | | Maximum number of uploaded files | 2 | - | Attempts reopened | Manually | + | Additional attempts | Manually | | Maximum attempts | Unlimited | And I log out And I log in as "student1" diff --git a/mod/assign/tests/behat/allow_another_attempt.feature b/mod/assign/tests/behat/allow_another_attempt.feature index 34b5d3ea5bd..d3a8f706e4f 100644 --- a/mod/assign/tests/behat/allow_another_attempt.feature +++ b/mod/assign/tests/behat/allow_another_attempt.feature @@ -24,7 +24,7 @@ Feature: In an assignment, students start a new attempt based on their previous | Description | Submit your online text | | assignsubmission_onlinetext_enabled | 1 | | assignsubmission_file_enabled | 0 | - | Attempts reopened | Manually | + | Additional attempts | Manually | | Hide grader identity from students | Yes | And I log out And I log in as "student1" @@ -96,7 +96,7 @@ Feature: In an assignment, students start a new attempt based on their previous | assignsubmission_onlinetext_enabled | 1 | | assignsubmission_file_enabled | 0 | | Students submit in groups | Yes | - | Attempts reopened | Manually | + | Additional attempts | Manually | | Maximum attempts | 3 | | Group mode | Separate groups | And I log out diff --git a/mod/assign/tests/behat/edit_previous_feedback.feature b/mod/assign/tests/behat/edit_previous_feedback.feature index 5ee1dd45cac..1eb5c40d7da 100644 --- a/mod/assign/tests/behat/edit_previous_feedback.feature +++ b/mod/assign/tests/behat/edit_previous_feedback.feature @@ -26,7 +26,7 @@ Feature: In an assignment, teachers can edit feedback for a students previous su | Description | Submit your online text | | assignsubmission_onlinetext_enabled | 1 | | assignfeedback_comments_enabled | 1 | - | Attempts reopened | Manually | + | Additional attempts | Manually | And I log out And I log in as "student2" And I am on "Course 1" course homepage diff --git a/mod/assign/tests/behat/grading_status.feature b/mod/assign/tests/behat/grading_status.feature index 4e828940f9f..b025a73e714 100644 --- a/mod/assign/tests/behat/grading_status.feature +++ b/mod/assign/tests/behat/grading_status.feature @@ -171,12 +171,12 @@ Feature: View the grading status of an assignment | Online text | I'm the student's second submission | And I press "Save changes" And I log out - # Teacher marks the submission again after noticing the 'Graded - follow up submission received'. + # Teacher marks the submission again after noticing the 'Graded - follow-up submission received'. And I log in as "teacher1" And I am on "Course 1" course homepage And I follow "Test assignment name" And I navigate to "View all submissions" in current page administration - And I should see "Graded - follow up submission received" in the "Student 1" "table_row" + And I should see "Graded - follow-up submission received" in the "Student 1" "table_row" And I wait "10" seconds And I click on "Grade" "link" in the "Student 1" "table_row" And I should see "1 of 1" diff --git a/mod/assign/tests/behat/group_submission.feature b/mod/assign/tests/behat/group_submission.feature index 6a8454301a5..65bde5ea837 100644 --- a/mod/assign/tests/behat/group_submission.feature +++ b/mod/assign/tests/behat/group_submission.feature @@ -168,7 +168,7 @@ Feature: Group assignment submissions | assignsubmission_onlinetext_enabled | 1 | | assignsubmission_file_enabled | 0 | | Students submit in groups | Yes | - | Attempts reopened | Manually | + | Additional attempts | Manually | | Group mode | No groups | | Require group to make submission | No | And I log out diff --git a/mod/assign/tests/behat/reopen_locked_submission.feature b/mod/assign/tests/behat/reopen_locked_submission.feature index 8b75b438969..2ae6a31eca5 100644 --- a/mod/assign/tests/behat/reopen_locked_submission.feature +++ b/mod/assign/tests/behat/reopen_locked_submission.feature @@ -25,7 +25,7 @@ Feature: Submissions are unlocked when a new attempt is given | Assignment name | Test assignment name | | Description | Submit your online text | | assignsubmission_onlinetext_enabled | 1 | - | Attempts reopened | Automatically until pass | + | Additional attempts | Automatically until pass | | Grade to pass | 50 | And I log out And I log in as "student1" @@ -59,7 +59,7 @@ Feature: Submissions are unlocked when a new attempt is given | Assignment name | Test assignment name | | Description | Submit your online text | | assignsubmission_onlinetext_enabled | 1 | - | Attempts reopened | Manually | + | Additional attempts | Manually | And I log out And I log in as "student1" And I am on "Course 1" course homepage diff --git a/mod/lesson/tests/behat/lesson_group_override.feature b/mod/lesson/tests/behat/lesson_group_override.feature index b5bcf89df1f..906d61785ff 100644 --- a/mod/lesson/tests/behat/lesson_group_override.feature +++ b/mod/lesson/tests/behat/lesson_group_override.feature @@ -273,9 +273,9 @@ Feature: Lesson group override And I press "Add group override" And I set the following fields to these values: | Override group | Group 1 | - | Maximum number of attempts | 2 | + | Maximum number of attempts per question | 2 | And I press "Save" - And I should see "Maximum number of attempts" + And I should see "Maximum number of attempts per question" And I log out And I log in as "student1" And I am on "Course 1" course homepage diff --git a/mod/lesson/tests/behat/lesson_review.feature b/mod/lesson/tests/behat/lesson_review.feature index 39e2731a449..d6c32475e00 100644 --- a/mod/lesson/tests/behat/lesson_review.feature +++ b/mod/lesson/tests/behat/lesson_review.feature @@ -25,7 +25,7 @@ Feature: In a lesson activity, students can review the answers they gave to ques | Slideshow | Yes | | Maximum number of answers | 10 | | Allow student review | Yes | - | Maximum number of attempts | 3 | + | Maximum number of attempts per question | 3 | | Custom scoring | No | | Re-takes allowed | Yes | And I follow "Test lesson name" diff --git a/mod/lesson/tests/behat/lesson_user_override.feature b/mod/lesson/tests/behat/lesson_user_override.feature index e33b5b4ff98..b08ccdc902e 100644 --- a/mod/lesson/tests/behat/lesson_user_override.feature +++ b/mod/lesson/tests/behat/lesson_user_override.feature @@ -271,9 +271,9 @@ Feature: Lesson user override And I press "Add user override" And I set the following fields to these values: | Override user | Student1 | - | Maximum number of attempts | 2 | + | Maximum number of attempts per question | 2 | And I press "Save" - And I should see "Maximum number of attempts" + And I should see "Maximum number of attempts per question" And I log out And I log in as "student1" And I am on "Course 1" course homepage @@ -399,7 +399,7 @@ Feature: Lesson user override And I press "Add user override" And I set the following fields to these values: | Override user | Student1 | - | Maximum number of attempts | 2 | + | Maximum number of attempts per question | 2 | And I press "Save" Then I should see "This override is inactive" And "Edit" "icon" should exist in the "Sam1 Student1" "table_row" diff --git a/mod/lesson/tests/behat/wrong_answer_continue.feature b/mod/lesson/tests/behat/wrong_answer_continue.feature index 45bfb8f4ef9..544d3eaa7da 100644 --- a/mod/lesson/tests/behat/wrong_answer_continue.feature +++ b/mod/lesson/tests/behat/wrong_answer_continue.feature @@ -23,7 +23,7 @@ Feature: An incorrect response to an answer with multiple attempts show appropri | Name | Test lesson name | | Description | Test lesson description | | Provide option to try a question again | Yes | - | Maximum number of attempts | 2 | + | Maximum number of attempts per question | 2 | And I press "Save and display" Scenario: A student answering incorrectly to a question will see an option to move to the next question if set up.