From 3f38b2807946ad5ecd1f7f705baaa41b6f322895 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mudr=C3=A1k?= Date: Mon, 27 Jan 2025 23:11:59 +0100 Subject: [PATCH] MDL-84321 lang: Use the fixed strings in tests, too --- .../table/aiprovider_management_table.php | 2 +- .../aiprovider_management_table_filterset.php | 2 +- ai/provider/azureai/classes/hook_listener.php | 2 +- ai/provider/azureai/db/hooks.php | 2 +- ai/provider/openai/classes/hook_listener.php | 2 +- ai/provider/openai/db/hooks.php | 2 +- ai/tests/behat/admin.feature | 26 +++++++++---------- .../behat/inline_editing_content.feature | 10 +++---- h5p/tests/behat/h5p_deployment.feature | 2 +- lib/db/caches.php | 2 +- .../tiny/plugins/h5p/tests/behat/h5p.feature | 24 ++++++++--------- mod/data/tests/behat/add_entries.feature | 2 +- .../behat/h5p_inline_editing_content.feature | 4 +-- .../behat/bank_add_default_shared.feature | 4 +-- 14 files changed, 43 insertions(+), 43 deletions(-) diff --git a/ai/classes/table/aiprovider_management_table.php b/ai/classes/table/aiprovider_management_table.php index 1248bb3ae0f..b6c336646d8 100644 --- a/ai/classes/table/aiprovider_management_table.php +++ b/ai/classes/table/aiprovider_management_table.php @@ -22,7 +22,7 @@ use flexible_table; use moodle_url; /** - * Table to manage AI Provider plugins. + * Table to manage AI provider plugins. * * @package core_ai * @copyright 2024 Matt Porritt diff --git a/ai/classes/table/aiprovider_management_table_filterset.php b/ai/classes/table/aiprovider_management_table_filterset.php index c25db5e34c6..bf4650b1f66 100644 --- a/ai/classes/table/aiprovider_management_table_filterset.php +++ b/ai/classes/table/aiprovider_management_table_filterset.php @@ -17,7 +17,7 @@ namespace core_ai\table; /** - * AI Provider management table filter set. + * AI provider management table filter set. * * @package core_ai * @copyright 2024 Matt Porritt diff --git a/ai/provider/azureai/classes/hook_listener.php b/ai/provider/azureai/classes/hook_listener.php index dc557cc56fa..c76504d0433 100644 --- a/ai/provider/azureai/classes/hook_listener.php +++ b/ai/provider/azureai/classes/hook_listener.php @@ -19,7 +19,7 @@ namespace aiprovider_azureai; use core_ai\hook\after_ai_provider_form_hook; /** - * Hook listener for Azure AI Provider. + * Hook listener for Azure AI provider. * * @package aiprovider_azureai * @copyright 2024 Matt Porritt diff --git a/ai/provider/azureai/db/hooks.php b/ai/provider/azureai/db/hooks.php index b9eeabc4c1a..16b9eda33f5 100644 --- a/ai/provider/azureai/db/hooks.php +++ b/ai/provider/azureai/db/hooks.php @@ -15,7 +15,7 @@ // along with Moodle. If not, see . /** - * Hook listener callbacks for the Azure AI Provider. + * Hook listener callbacks for the Azure AI provider. * * @package aiprovider_azureai * @copyright 2024 Matt Porritt diff --git a/ai/provider/openai/classes/hook_listener.php b/ai/provider/openai/classes/hook_listener.php index 07ee53d9554..e8adca5ca62 100644 --- a/ai/provider/openai/classes/hook_listener.php +++ b/ai/provider/openai/classes/hook_listener.php @@ -19,7 +19,7 @@ namespace aiprovider_openai; use core_ai\hook\after_ai_provider_form_hook; /** - * Hook listener for Open AI Provider. + * Hook listener for Open AI provider. * * @package aiprovider_openai * @copyright 2024 Matt Porritt diff --git a/ai/provider/openai/db/hooks.php b/ai/provider/openai/db/hooks.php index 2555bbd5b07..c6b06d2833c 100644 --- a/ai/provider/openai/db/hooks.php +++ b/ai/provider/openai/db/hooks.php @@ -15,7 +15,7 @@ // along with Moodle. If not, see . /** - * Hook listener callbacks for the Open AI Provider. + * Hook listener callbacks for the Open AI provider. * * @package aiprovider_openai * @copyright 2024 Matt Porritt diff --git a/ai/tests/behat/admin.feature b/ai/tests/behat/admin.feature index 84d75c56aee..55c6d023867 100644 --- a/ai/tests/behat/admin.feature +++ b/ai/tests/behat/admin.feature @@ -5,31 +5,31 @@ Feature: An administrator can manage AI subsystem settings I can manage AI subsystem settings @javascript - Scenario: An administrator can create AI Provider plugin instances using JavaScript + Scenario: An administrator can create AI provider plugin instances using JavaScript Given I am logged in as "admin" And I navigate to "AI > AI providers" in site administration And I should see "Nothing to display" When I click on "Create a new provider instance" "link" - And I select "OpenAI API Provider" from the "Choose AI Provider plugin" singleselect + And I select "OpenAI API provider" from the "Choose AI provider plugin" singleselect And I set the following fields to these values: | Name for instance | OpenAI API provider test| | OpenAI API key | 123 | | OpenAI organization ID| abc | And I click on "Create instance" "button" - And I should see "OpenAI API provider test AI Provider instance created" + And I should see "OpenAI API provider test AI provider instance created" And I should see "OpenAI API provider test" And I click on "Create a new provider instance" "link" - And I select "Azure AI API Provider" from the "Choose AI Provider plugin" singleselect + And I select "Azure AI API provider" from the "Choose AI provider plugin" singleselect And I set the following fields to these values: | Name for instance | Azure AI provider test | | Azure AI API key | 123 | | Azure AI API endpoint| https://api.cognitive.microsofttranslator.com/ | And I click on "Create instance" "button" - And I should see "Azure AI provider test AI Provider instance created" + And I should see "Azure AI provider test AI provider instance created" And I should see "Azure AI provider test" @javascript - Scenario: An administrator can enable AI Provider plugin instances using JavaScript + Scenario: An administrator can enable AI provider plugin instances using JavaScript Given the following "core_ai > ai providers" exist: |provider | name | enabled | apikey | orgid | |aiprovider_openai| OpenAI API test | 0 | 123 | abc | @@ -53,7 +53,7 @@ Feature: An administrator can manage AI subsystem settings Then I should see "Azure AI API test disabled." @javascript - Scenario: An administrator can configure AI Provider plugin instance + Scenario: An administrator can configure AI provider plugin instance action settings using JavaScript Given the following "core_ai > ai providers" exist: |provider | name | enabled | apikey | orgid | @@ -71,16 +71,16 @@ Feature: An administrator can manage AI subsystem settings Then I should see "Generate text action settings updated" @javascript - Scenario: An administrator can delete AI Provider plugin instances using JavaScript + Scenario: An administrator can delete AI provider plugin instances using JavaScript Given the following "core_ai > ai providers" exist: |provider | name | enabled | apikey | orgid | |aiprovider_openai| OpenAI API test | 0 | 123 | abc | And I am logged in as "admin" And I navigate to "AI > AI providers" in site administration And I click on the "Delete" link in the table row containing "OpenAI API test" - And "Delete AI Provider instance" "dialogue" should be visible - And I click on "Delete" "button" in the "Delete AI Provider instance" "dialogue" - Then I should see "OpenAI API test AI Provider instance deleted" + And "Delete AI provider instance" "dialogue" should be visible + And I click on "Delete" "button" in the "Delete AI provider instance" "dialogue" + Then I should see "OpenAI API test AI provider instance deleted" @javascript Scenario: An administrator can control the enabled state of AI placement plugins using JavaScript @@ -94,7 +94,7 @@ Feature: An administrator can manage AI subsystem settings Then I should see "Text editor placement disabled." @javascript - Scenario: Placement actions should be available when an Administrator enables AI Providers using JavaScript + Scenario: Placement actions should be available when an Administrator enables AI providers using JavaScript Given the following "core_ai > ai providers" exist: |provider | name | enabled | apikey | orgid | |aiprovider_openai| OpenAI API test | 1 | 123 | abc | @@ -104,7 +104,7 @@ Feature: An administrator can manage AI subsystem settings Then I should not see "This action is unavailable." @javascript - Scenario: Placement actions should not be available when an Administrator disables AI Providers using JavaScript + Scenario: Placement actions should not be available when an Administrator disables AI providers using JavaScript Given the following "core_ai > ai providers" exist: |provider | name | enabled | apikey | orgid | |aiprovider_openai| OpenAI API test | 1 | 123 | abc | diff --git a/filter/displayh5p/tests/behat/inline_editing_content.feature b/filter/displayh5p/tests/behat/inline_editing_content.feature index 76a15f0192a..69225e13f31 100644 --- a/filter/displayh5p/tests/behat/inline_editing_content.feature +++ b/filter/displayh5p/tests/behat/inline_editing_content.feature @@ -42,7 +42,7 @@ Feature: Inline editing H5P content anywhere # Add H5P content to the page. And I am on the "PageName1" "page activity" page logged in as "teacher1" And I navigate to "Settings" in current page administration - And I click on "Configure H5P content" "button" in the "#fitem_id_page" "css_element" + And I click on "Insert H5P content" "button" in the "#fitem_id_page" "css_element" And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue" And I select "Private files" repository in file picker And I click on "greeting-card.h5p" "file" in repository content area @@ -86,7 +86,7 @@ Feature: Inline editing H5P content anywhere # Add H5P content to the page. And I am on the "PageName1" "page activity" page And I navigate to "Settings" in current page administration - And I click on "Configure H5P content" "button" in the "#fitem_id_page" "css_element" + And I click on "Insert H5P content" "button" in the "#fitem_id_page" "css_element" And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue" And I select "Content bank" repository in file picker And I click on "Greeting card" "file" in repository content area @@ -130,7 +130,7 @@ Feature: Inline editing H5P content anywhere # Add H5P content to the page. And I am on the "PageName1" "page activity" page And I navigate to "Settings" in current page administration - And I click on "Configure H5P content" "button" in the "#fitem_id_page" "css_element" + And I click on "Insert H5P content" "button" in the "#fitem_id_page" "css_element" And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue" And I select "Content bank" repository in file picker And I click on "Greeting card" "file" in repository content area @@ -176,7 +176,7 @@ Feature: Inline editing H5P content anywhere # Add H5P content to the page. And I am on the "PageName1" "page activity" page And I navigate to "Settings" in current page administration - And I click on "Configure H5P content" "button" in the "#fitem_id_page" "css_element" + And I click on "Insert H5P content" "button" in the "#fitem_id_page" "css_element" And I set the field "H5P URL or file upload" to "https://moodle.h5p.com/content/1290772960722742119" And I click on "Insert H5P" "button" in the "Insert H5P content" "dialogue" And I click on "Save and display" "button" @@ -219,7 +219,7 @@ Feature: Inline editing H5P content anywhere | Text block title | H5PTest | | Content | - | And I configure the "H5PTest" block - And I click on "Configure H5P content" "button" in the "//div[contains(@id,'fitem_id_config_text')]" "xpath_element" + And I click on "Insert H5P content" "button" in the "//div[contains(@id,'fitem_id_config_text')]" "xpath_element" And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue" And I select "Content bank" repository in file picker And I click on "Greeting card" "file" in repository content area diff --git a/h5p/tests/behat/h5p_deployment.feature b/h5p/tests/behat/h5p_deployment.feature index f7d2ab26c7b..a01a7f1fe34 100644 --- a/h5p/tests/behat/h5p_deployment.feature +++ b/h5p/tests/behat/h5p_deployment.feature @@ -26,7 +26,7 @@ Feature: Undeployed H5P content should be only available to users that can deplo And the following "contentbank content" exist: | contextlevel | reference | contenttype | user | contentname | filepath | | Course | C1 | contenttype_h5p | teacher1 | filltheblanks.h5p | /h5p/tests/fixtures/filltheblanks.h5p | - And I click on the "Configure H5P content" button for the "Page content" TinyMCE editor + And I click on the "Insert H5P content" button for the "Page content" TinyMCE editor And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue" And I click on "Content bank" "link" in the ".fp-repo-area" "css_element" And I click on "filltheblanks.h5p" "link" diff --git a/lib/db/caches.php b/lib/db/caches.php index 5451ce3d9a7..b3ad892d16e 100644 --- a/lib/db/caches.php +++ b/lib/db/caches.php @@ -640,7 +640,7 @@ $definitions = array( 'canuselocalstore' => true, ], // Cache to store AI rate limits. - // Used by AI Provider plugins to limit the number of requests to external services. + // Used by AI provider plugins to limit the number of requests to external services. 'ai_ratelimit' => [ 'mode' => cache_store::MODE_APPLICATION, 'simplekeys' => true, // Cache must use simple keys (a-zA-Z0-9_). diff --git a/lib/editor/tiny/plugins/h5p/tests/behat/h5p.feature b/lib/editor/tiny/plugins/h5p/tests/behat/h5p.feature index 0c6d6634718..075d9e1ab20 100644 --- a/lib/editor/tiny/plugins/h5p/tests/behat/h5p.feature +++ b/lib/editor/tiny/plugins/h5p/tests/behat/h5p.feature @@ -25,7 +25,7 @@ Feature: Use the TinyMCE editor to upload an h5p package Scenario: TinyMCE can be used to embed an H5P activity Given I change window size to "large" And I am on the PageName1 "page activity editing" page logged in as admin - And I click on the "Configure H5P content" button for the "Page content" TinyMCE editor + And I click on the "Insert H5P content" button for the "Page content" TinyMCE editor And I set the field "H5P URL or file upload" to "https://moodle.h5p.com/content/1290772960722742119" And I click on "Insert H5P content" "button" in the "Insert H5P content" "dialogue" When I click on "Save and display" "button" @@ -40,7 +40,7 @@ Feature: Use the TinyMCE editor to upload an h5p package | filepath | h5p/tests/fixtures/guess-the-answer.h5p | And I change window size to "large" And I am on the "PageName1" "page activity editing" page logged in as "admin" - And I click on the "Configure H5P content" button for the "Page content" TinyMCE editor + And I click on the "Insert H5P content" button for the "Page content" TinyMCE editor And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue" And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "guess-the-answer.h5p" "link" @@ -55,7 +55,7 @@ Feature: Use the TinyMCE editor to upload an h5p package | capability | permission | role | contextlevel | reference | | tiny/h5p:addembed | Prohibit | editingteacher | Course | C1 | When I am on the PageName1 "page activity editing" page logged in as teacher1 - Then "Configure H5P content" "button" should not exist + Then "Insert H5P content" "button" should not exist @javascript Scenario: When a user does not have the Upload H5P capability, they can embed but not upload H5P content with TinyMCE @@ -63,7 +63,7 @@ Feature: Use the TinyMCE editor to upload an h5p package | capability | permission | role | contextlevel | reference | | moodle/h5p:deploy | Prohibit | editingteacher | Course | C1 | When I am on the PageName1 "page activity editing" page logged in as teacher1 - And I click on the "Configure H5P content" button for the "Page content" TinyMCE editor + And I click on the "Insert H5P content" button for the "Page content" TinyMCE editor Then I should not see "H5P file upload" in the "Insert H5P content" "dialogue" And I should see "H5P URL" in the "Insert H5P content" "dialogue" And I should not see "H5P options" in the "Insert H5P content" "dialogue" @@ -74,7 +74,7 @@ Feature: Use the TinyMCE editor to upload an h5p package | user | admin | | filepath | h5p/tests/fixtures/drag.h5p | And I am on the "PageName1" "page activity editing" page logged in as "admin" - And I click on the "Configure H5P content" button for the "Page content" TinyMCE editor + And I click on the "Insert H5P content" button for the "Page content" TinyMCE editor And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue" And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "drag" "link" @@ -88,7 +88,7 @@ Feature: Use the TinyMCE editor to upload an h5p package And I switch to the main frame And I navigate to "Settings" in current page administration And I select the ".h5p-placeholder" "css_element" in the "Page content" TinyMCE editor - And I click on the "Configure H5P content" button for the "Page content" TinyMCE editor + And I click on the "Insert H5P content" button for the "Page content" TinyMCE editor And I set the field "H5P URL or file upload" to "https://moodle.h5p.com/content/1290772960722742119" And I click on "Insert H5P" "button" in the "Insert H5P content" "dialogue" And I wait "1" seconds @@ -103,7 +103,7 @@ Feature: Use the TinyMCE editor to upload an h5p package | user | admin | | filepath | h5p/tests/fixtures/guess-the-answer.h5p | And I am on the "PageName1" "page activity editing" page logged in as "admin" - And I click on the "Configure H5P content" button for the "Page content" TinyMCE editor + And I click on the "Insert H5P content" button for the "Page content" TinyMCE editor And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue" And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "guess-the-answer.h5p" "link" @@ -116,7 +116,7 @@ Feature: Use the TinyMCE editor to upload an h5p package And I switch to the main frame And I navigate to "Settings" in current page administration And I select the ".h5p-placeholder" "css_element" in the "Page content" TinyMCE editor - And I click on the "Configure H5P content" button for the "Page content" TinyMCE editor + And I click on the "Insert H5P content" button for the "Page content" TinyMCE editor And I click on "H5P options" "link" And I click on "Allow download" "checkbox" And I click on "Insert H5P" "button" in the "Insert H5P content" "dialogue" @@ -130,7 +130,7 @@ Feature: Use the TinyMCE editor to upload an h5p package And I switch to the main frame And I navigate to "Settings" in current page administration And I select the ".h5p-placeholder" "css_element" in the "Page content" TinyMCE editor - And I click on the "Configure H5P content" button for the "Page content" TinyMCE editor + And I click on the "Insert H5P content" button for the "Page content" TinyMCE editor And I click on "Allow download" "checkbox" And I click on "Embed button" "checkbox" And I click on "Copyright button" "checkbox" @@ -147,7 +147,7 @@ Feature: Use the TinyMCE editor to upload an h5p package Scenario: H5P options are ignored for H5P URLs Given I change window size to "large" And I am on the PageName1 "page activity editing" page logged in as admin - And I click on the "Configure H5P content" button for the "Page content" TinyMCE editor + And I click on the "Insert H5P content" button for the "Page content" TinyMCE editor And I set the field "H5P URL or file upload" to "https://moodle.h5p.com/content/1291366510035871129" And I click on "H5P options" "link" And I click on "Embed button" "checkbox" @@ -160,7 +160,7 @@ Feature: Use the TinyMCE editor to upload an h5p package And I switch to the main frame And I navigate to "Settings" in current page administration And I select the ".h5p-placeholder" "css_element" in the "Page content" TinyMCE editor - And I click on the "Configure H5P content" button for the "Page content" TinyMCE editor + And I click on the "Insert H5P content" button for the "Page content" TinyMCE editor And I click on "H5P options" "link" And "input[aria-label=\"Embed button\"]:not([checked=checked])" "css_element" should exist @@ -176,7 +176,7 @@ Feature: Use the TinyMCE editor to upload an h5p package | user | admin | | filepath | h5p/tests/fixtures/guess-the-answer.h5p | And I am on the "PageName1" "page activity editing" page logged in as "admin" - And I click on the "Configure H5P content" button for the "Page content" TinyMCE editor + And I click on the "Insert H5P content" button for the "Page content" TinyMCE editor And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue" And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "guess-the-answer.h5p" "link" diff --git a/mod/data/tests/behat/add_entries.feature b/mod/data/tests/behat/add_entries.feature index 266a1e69921..4102aa9e4db 100644 --- a/mod/data/tests/behat/add_entries.feature +++ b/mod/data/tests/behat/add_entries.feature @@ -81,7 +81,7 @@ Feature: Users can add entries to database activities And I am on the "Course 1" course page logged in as teacher1 When I click on "Test database name" "link" And I click on "Add entry" "button" - And I click on "Configure H5P content" "button" + And I click on "Insert H5P content" "button" Then I should see "Browse repositories..." in the "Insert H5P content" "dialogue" @javascript diff --git a/mod/forum/tests/behat/h5p_inline_editing_content.feature b/mod/forum/tests/behat/h5p_inline_editing_content.feature index 76299cde349..c84d49bd977 100644 --- a/mod/forum/tests/behat/h5p_inline_editing_content.feature +++ b/mod/forum/tests/behat/h5p_inline_editing_content.feature @@ -35,7 +35,7 @@ Feature: Inline editing H5P content in mod_forum Scenario: Edit H5P content from a forum intro using copy to content bank file Given I am on the "ForumName1" "forum activity editing" page logged in as admin # Add H5P content to the forum description. - And I click on "Configure H5P content" "button" in the "#fitem_id_introeditor" "css_element" + And I click on "Insert H5P content" "button" in the "#fitem_id_introeditor" "css_element" And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue" And I select "Content bank" repository in file picker And I click on "Greeting card" "file" in repository content area @@ -82,7 +82,7 @@ Feature: Inline editing H5P content in mod_forum # Add H5P content to a forum post as admin. And I set the following fields to these values: | Subject | Forum post by admin | - And I click on "Configure H5P content" "button" in the "#fitem_id_message" "css_element" + And I click on "Insert H5P content" "button" in the "#fitem_id_message" "css_element" And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue" And I select "Content bank" repository in file picker And I click on "Greeting card" "file" in repository content area diff --git a/question/tests/behat/bank_add_default_shared.feature b/question/tests/behat/bank_add_default_shared.feature index fb23c9407bc..155d774b6cd 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 does not 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" + But I should not see "This course does not have any question banks yet." And I should see "Default course question bank created" And I should see "Course 1 course question bank"