From 7af4e8816fbb70cc061320206bf4ddc9877cff6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mudr=C3=A1k?= Date: Thu, 1 Aug 2024 12:58:27 +0200 Subject: [PATCH] MDL-82599 lang: Use the fixed strings in tests, too --- .../tests/behat/block_rss_client_frontpage.feature | 12 ++++++------ cohort/tests/behat/delete_cohorts.feature | 4 ++-- .../field/textarea/tests/behat/default_value.feature | 2 +- customfield/tests/behat/edit_fields_settings.feature | 2 +- .../tests/behat/accessibilitychecker.feature | 4 ++-- .../plugins/autosave/tests/behat/autosave.feature | 2 +- .../tiny/plugins/link/tests/behat/link.feature | 4 ++-- .../tiny/plugins/media/tests/behat/image.feature | 4 ++-- .../behat/message_drawer_manage_contacts.feature | 2 +- mod/lesson/tests/behat/duplicate_lesson_page.feature | 6 +++--- mod/lesson/tests/behat/questions_images.feature | 4 ++-- mod/quiz/tests/behat/manually_mark_question.feature | 2 +- mod/workshop/tests/behat/embedded_images.feature | 6 +++--- question/tests/behat/delete_questions.feature | 4 ++-- 14 files changed, 29 insertions(+), 29 deletions(-) diff --git a/blocks/rss_client/tests/behat/block_rss_client_frontpage.feature b/blocks/rss_client/tests/behat/block_rss_client_frontpage.feature index 36eddaf2970..7b25767abd7 100644 --- a/blocks/rss_client/tests/behat/block_rss_client_frontpage.feature +++ b/blocks/rss_client/tests/behat/block_rss_client_frontpage.feature @@ -17,9 +17,9 @@ Feature: Enable RSS client block menu on the frontpage Given I log in as "admin" And I am on site homepage And I turn editing mode on - And "Remote news feed" "block" should exist - And I configure the "Remote news feed" block - And I should see "There are no existing RSS feeds configured for this site. You can add one choosing 'Add new RSS feed'." + And "RSS feed" "block" should exist + And I configure the "RSS feed" block + And I should see "There are not yet any RSS feeds. Choose 'Add new RSS feed'." # Test filling in an empty URL in the input. And I click on "Add new RSS feed" "radio" @@ -40,9 +40,9 @@ Feature: Enable RSS client block menu on the frontpage # Test the existence of the available feeds. When I configure the "NASA" block - Then I should see "NASA" in the "Select the feeds to display in this block" "select" + Then I should see "NASA" in the "Select feeds to display" "select" And I click on "Cancel" "button" in the "Configure NASA block" "dialogue" - # Test the Manage all my feeds page. - And I click on "Manage all my feeds" "link" + # Test the Manage RSS feeds page. + And I click on "Manage RSS feeds" "link" And I should see "NASA" diff --git a/cohort/tests/behat/delete_cohorts.feature b/cohort/tests/behat/delete_cohorts.feature index 1b65754eebc..80669efedf6 100644 --- a/cohort/tests/behat/delete_cohorts.feature +++ b/cohort/tests/behat/delete_cohorts.feature @@ -21,7 +21,7 @@ Feature: Delete cohorts | Cohort 2 | cohort2 | | Cohort 3 | cohort3 | When I press "Delete" action in the "Cohort 1" report row - Then I should see "Do you really want to delete cohort 'Cohort 1'?" in the "Delete selected" "dialogue" + Then I should see "This will delete cohort 'Cohort 1' and all associated data." in the "Delete selected" "dialogue" And I click on "Delete" "button" in the "Delete selected" "dialogue" And I should see "Deleted cohort" And I should not see "Cohort 1" in the "Cohorts" "table" @@ -40,7 +40,7 @@ Feature: Delete cohorts When I click on "Select 'Cohort 1'" "checkbox" And I click on "Select 'Cohort 2'" "checkbox" And I click on "Delete selected" "button" - Then I should see "Do you really want to delete the selected cohorts?" in the "Delete selected" "dialogue" + Then I should see "This will delete the cohorts and all associated data." in the "Delete selected" "dialogue" And I click on "Delete" "button" in the "Delete selected" "dialogue" And I should see "Deleted selected cohorts" And I should not see "Cohort 1" in the "Cohorts" "table" diff --git a/customfield/field/textarea/tests/behat/default_value.feature b/customfield/field/textarea/tests/behat/default_value.feature index 73cbe42b444..a1c39c26701 100644 --- a/customfield/field/textarea/tests/behat/default_value.feature +++ b/customfield/field/textarea/tests/behat/default_value.feature @@ -37,7 +37,7 @@ Feature: Default value for the textarea custom field can contain images And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "gd-logo.png" "link" And I click on "Select this file" "button" - And I set the field "How would you describe this image to someone who can't see it:" to "Example" + And I set the field "How would you describe this image to someone who can't see it?" to "Example" And I click on "Save" "button" in the "Image details" "dialogue" And I click on "Save changes" "button" in the "Adding a new Text area" "dialogue" And I log out diff --git a/customfield/tests/behat/edit_fields_settings.feature b/customfield/tests/behat/edit_fields_settings.feature index 8d01ec6681d..b2f6641f1fc 100644 --- a/customfield/tests/behat/edit_fields_settings.feature +++ b/customfield/tests/behat/edit_fields_settings.feature @@ -84,7 +84,7 @@ Feature: Teachers can edit course custom fields And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "gd-logo.png" "link" And I click on "Select this file" "button" - And I set the field "How would you describe this image to someone who can't see it:" to "Example" + And I set the field "How would you describe this image to someone who can't see it?" to "Example" And I click on "Save" "button" in the "Image details" "dialogue" And I click on "Save changes" "button" in the "Updating Field 1" "dialogue" And I log out diff --git a/lib/editor/tiny/plugins/accessibilitychecker/tests/behat/accessibilitychecker.feature b/lib/editor/tiny/plugins/accessibilitychecker/tests/behat/accessibilitychecker.feature index 9ec5a592322..dfc3d068e09 100644 --- a/lib/editor/tiny/plugins/accessibilitychecker/tests/behat/accessibilitychecker.feature +++ b/lib/editor/tiny/plugins/accessibilitychecker/tests/behat/accessibilitychecker.feature @@ -29,7 +29,7 @@ Feature: Tiny editor accessibility checker And I click on the "Image" button for the "Description" TinyMCE editor And I wait "1" seconds And I click on "This image is decorative only" "checkbox" - And I set the field "How would you describe this image to someone who can't see it:" to "No more warning!" + And I set the field "How would you describe this image to someone who can't see it?" to "No more warning!" And I press "Save" And I click on the "Tools > Accessibility checker" menu item for the "Description" TinyMCE editor And I should see "Congratulations, no accessibility issues found!" in the "Accessibility checker" "dialogue" @@ -39,7 +39,7 @@ Feature: Tiny editor accessibility checker And I set the field "URL" to "http://download.moodle.org/unittest/test.jpg" And I click on "Add" "button" in the "Insert image" "dialogue" And I wait "1" seconds - And I set the field "How would you describe this image to someone who can't see it:" to "" + And I set the field "How would you describe this image to someone who can't see it?" to "" And I click on "This image is decorative only" "checkbox" When I press "Save" And I click on the "Tools > Accessibility checker" menu item for the "Description" TinyMCE editor diff --git a/lib/editor/tiny/plugins/autosave/tests/behat/autosave.feature b/lib/editor/tiny/plugins/autosave/tests/behat/autosave.feature index b647ce72aeb..4c5c05cd710 100644 --- a/lib/editor/tiny/plugins/autosave/tests/behat/autosave.feature +++ b/lib/editor/tiny/plugins/autosave/tests/behat/autosave.feature @@ -45,7 +45,7 @@ Feature: Tiny editor autosave And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "tinyscreenshot.png" "link" And I click on "Select this file" "button" - And I set the field "How would you describe this image to someone who can't see it:" to "It's the Moodle" + And I set the field "How would you describe this image to someone who can't see it?" to "It's the Moodle" And I click on "Save" "button" in the "Image details" "dialogue" And I click on "Save and display" "button" When I am on the "Course 1" course page logged in as teacher1 diff --git a/lib/editor/tiny/plugins/link/tests/behat/link.feature b/lib/editor/tiny/plugins/link/tests/behat/link.feature index a1eb2e6ce3d..a08c529319a 100644 --- a/lib/editor/tiny/plugins/link/tests/behat/link.feature +++ b/lib/editor/tiny/plugins/link/tests/behat/link.feature @@ -107,7 +107,7 @@ Feature: Add links to TinyMCE And I select "Private files" repository in file picker And I click on "moodle-logo.png" "link" And I click on "Select this file" "button" - And I set the field "How would you describe this image to someone who can't see it:" to "It's the Moodle" + And I set the field "How would you describe this image to someone who can't see it?" to "It's the Moodle" And I click on "Save" "button" in the "Image details" "dialogue" And I select the "img" element in position "0" of the "Description" TinyMCE editor And I click on the "Link" button for the "Description" TinyMCE editor @@ -129,7 +129,7 @@ Feature: Add links to TinyMCE And I click on "Edit profile" "link" in the "region-main" "region" And I select the "img" element in position "0" of the "Description" TinyMCE editor And I click on the "Image" button for the "Description" TinyMCE editor - And the field "How would you describe this image to someone who can't see it:" matches value "It's the Moodle" + And the field "How would you describe this image to someone who can't see it?" matches value "It's the Moodle" And I click on "Close" "button" in the "Image details" "dialogue" And I click on the "Link" button for the "Description" TinyMCE editor And the field "Text to display" matches value "Moodle - Open-source learning platform" diff --git a/lib/editor/tiny/plugins/media/tests/behat/image.feature b/lib/editor/tiny/plugins/media/tests/behat/image.feature index 39ea3e19380..a9df5f33117 100644 --- a/lib/editor/tiny/plugins/media/tests/behat/image.feature +++ b/lib/editor/tiny/plugins/media/tests/behat/image.feature @@ -34,11 +34,11 @@ Feature: Use the TinyMCE editor to upload an image And I click on the "Image" button for the "Description" TinyMCE editor And I click on "Browse repositories" "button" in the "Insert image" "dialogue" And I upload "lib/editor/tiny/tests/behat/fixtures/moodle-logo.png" to the file picker for TinyMCE - And I set the field "How would you describe this image to someone who can't see it:" to "It's the Moodle" + And I set the field "How would you describe this image to someone who can't see it?" to "It's the Moodle" And I click on "Save" "button" in the "Image details" "dialogue" When I select the "img" element in position "0" of the "Description" TinyMCE editor And I click on the "Image" button for the "Description" TinyMCE editor - Then the field "How would you describe this image to someone who can't see it:" matches value "It's the Moodle" + Then the field "How would you describe this image to someone who can't see it?" matches value "It's the Moodle" # Note: This needs to be replaced with a label. And ".tiny_image_preview" "css_element" should be visible diff --git a/message/tests/behat/message_drawer_manage_contacts.feature b/message/tests/behat/message_drawer_manage_contacts.feature index 7f50f91dc0a..5b94fa13518 100644 --- a/message/tests/behat/message_drawer_manage_contacts.feature +++ b/message/tests/behat/message_drawer_manage_contacts.feature @@ -66,7 +66,7 @@ Feature: Manage contacts Then I should see "Contact request sent" And I log out And I am on the "student3" "user > profile" page logged in as student4 - And I should see "Waiting for your approval" + And I should see "Waiting to be added as contact" And I open messaging And I click on "Contacts" "link" And I click on "Requests" "link_or_button" diff --git a/mod/lesson/tests/behat/duplicate_lesson_page.feature b/mod/lesson/tests/behat/duplicate_lesson_page.feature index 52f5ddf8f7f..b3c2a76e2c8 100644 --- a/mod/lesson/tests/behat/duplicate_lesson_page.feature +++ b/mod/lesson/tests/behat/duplicate_lesson_page.feature @@ -40,7 +40,7 @@ Feature: In a lesson activity, a teacher can duplicate a lesson page And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "moodle_logo.jpg" "link" And I click on "Select this file" "button" - And I set the field "How would you describe this image to someone who can't see it:" to "It's the logo" + And I set the field "How would you describe this image to someone who can't see it?" to "It's the logo" And I click on "Save" "button" in the "Image details" "dialogue" And I press "Save page" And I follow "Duplicate page: First page name" @@ -74,7 +74,7 @@ Feature: In a lesson activity, a teacher can duplicate a lesson page And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "moodle_logo.jpg" "link" And I click on "Select this file" "button" - And I set the field "How would you describe this image to someone who can't see it:" to "It's the logo" + And I set the field "How would you describe this image to someone who can't see it?" to "It's the logo" And I click on "Save" "button" in the "Image details" "dialogue" And I press "Save page" And I follow "Duplicate page: True false with an image in the answer" @@ -111,7 +111,7 @@ Feature: In a lesson activity, a teacher can duplicate a lesson page And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "moodle_logo.jpg" "link" And I click on "Select this file" "button" - And I set the field "How would you describe this image to someone who can't see it:" to "It's the logo" + And I set the field "How would you describe this image to someone who can't see it?" to "It's the logo" And I click on "Save" "button" in the "Image details" "dialogue" And I press "Save page" And I follow "Duplicate page: True false with an image in the feedback" diff --git a/mod/lesson/tests/behat/questions_images.feature b/mod/lesson/tests/behat/questions_images.feature index 3cf3d86b303..39c4146842e 100644 --- a/mod/lesson/tests/behat/questions_images.feature +++ b/mod/lesson/tests/behat/questions_images.feature @@ -48,7 +48,7 @@ Feature: In a lesson activity, teacher can add embedded images in questions answ And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "moodle_logo.jpg" "link" And I click on "Select this file" "button" - And I set the field "How would you describe this image to someone who can't see it:" to "It's the logo" + And I set the field "How would you describe this image to someone who can't see it?" to "It's the logo" And I click on "Save" "button" in the "Image details" "dialogue" And I press "Save page" And I set the field "qtype" to "Add a question page" @@ -68,7 +68,7 @@ Feature: In a lesson activity, teacher can add embedded images in questions answ And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "moodle_logo.jpg" "link" And I click on "Select this file" "button" - And I set the field "How would you describe this image to someone who can't see it:" to "It's the logo" + And I set the field "How would you describe this image to someone who can't see it?" to "It's the logo" And I click on "Save" "button" in the "Image details" "dialogue" And I press "Save page" When I am on the "Test lesson name" "lesson activity" page logged in as student1 diff --git a/mod/quiz/tests/behat/manually_mark_question.feature b/mod/quiz/tests/behat/manually_mark_question.feature index e07dacdaf65..981b2d29715 100644 --- a/mod/quiz/tests/behat/manually_mark_question.feature +++ b/mod/quiz/tests/behat/manually_mark_question.feature @@ -69,7 +69,7 @@ Feature: Teachers can override the grade for any question And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "moodle_logo.jpg" "link" And I click on "Select this file" "button" - And I set the field "How would you describe this image to someone who can't see it:" to "It's the logo" + And I set the field "How would you describe this image to someone who can't see it?" to "It's the logo" And I click on "Save" "button" in the "Image details" "dialogue" And I press "Save" and switch to main window And I switch to the main window diff --git a/mod/workshop/tests/behat/embedded_images.feature b/mod/workshop/tests/behat/embedded_images.feature index faf5b47a83d..146e2cf2927 100644 --- a/mod/workshop/tests/behat/embedded_images.feature +++ b/mod/workshop/tests/behat/embedded_images.feature @@ -37,7 +37,7 @@ Feature: Teachers can embed images into instructions and conclusion fields And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "moodlelogo.png" "link" And I click on "Select this file" "button" - And I set the field "How would you describe this image to someone who can't see it:" to "How to submit" + And I set the field "How would you describe this image to someone who can't see it?" to "How to submit" And I click on "Save" "button" in the "Image details" "dialogue" And I press "Save and display" # Embed the image into Instructions for assessment. @@ -48,7 +48,7 @@ Feature: Teachers can embed images into instructions and conclusion fields And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "moodlelogo.png" "link" And I click on "Select this file" "button" - And I set the field "How would you describe this image to someone who can't see it:" to "How to assess" + And I set the field "How would you describe this image to someone who can't see it?" to "How to assess" And I click on "Save" "button" in the "Image details" "dialogue" And I press "Save and display" # Embed the image into Conclusion. @@ -59,7 +59,7 @@ Feature: Teachers can embed images into instructions and conclusion fields And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "moodlelogo.png" "link" And I click on "Select this file" "button" - And I set the field "How would you describe this image to someone who can't see it:" to "Well done" + And I set the field "How would you describe this image to someone who can't see it?" to "Well done" And I click on "Save" "button" in the "Image details" "dialogue" And I press "Save and display" # Save the form and check the images are displayed in appropriate phases. diff --git a/question/tests/behat/delete_questions.feature b/question/tests/behat/delete_questions.feature index 1800c07936c..7cb1f6f8e10 100644 --- a/question/tests/behat/delete_questions.feature +++ b/question/tests/behat/delete_questions.feature @@ -52,7 +52,7 @@ Feature: A teacher can delete questions in the question bank When I am on the "Course 1" "core_question > course question bank" page And I choose "Delete" action for "Test used question to be deleted" in the question bank And I should see "This will delete the following question and all its versions:" - And I should see "* Denotes questions which can't be deleted because they are in use. Instead, they will be hidden in the question bank unless you select 'Show old questions'." + And I should see "* Denotes questions which can't be deleted because they are in use. Instead, they will be hidden in the question bank unless you set 'Show hidden questions' to 'Yes'." And I press "Delete" Then I should not see "Test used question to be deleted" And I apply question bank filter "Show hidden questions" with value "Yes" @@ -80,7 +80,7 @@ Feature: A teacher can delete questions in the question bank | Test questions | Test question to be deleted | Test question to be deleted version 2 | And I choose "Delete" action for "Test question to be deleted" in the question bank And I should see "This will delete the following question and all its versions:" - And I should not see "* Denotes questions which can't be deleted because they are in use. Instead, they will be hidden in the question bank unless you select 'Show old questions'." + And I should not see "* Denotes questions which can't be deleted because they are in use. Instead, they will be hidden in the question bank unless you set 'Show hidden questions' to 'Yes'." And I press "Delete" Then I should not see "Test question to be deleted" And I should not see "Test question to be deleted version2"