From 03402e3c5d240c9ff8200736014c17dd217f4f54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mudr=C3=A1k?= Date: Wed, 12 May 2021 08:48:00 +0200 Subject: [PATCH] MDL-71580 lang: Fix reworded strings in tests --- .../tests/behat/accessresults.feature | 4 ++-- .../oauth2/tests/behat/basic_settings.feature | 20 +++++++++---------- backup/upgrade.txt | 2 +- .../util/ui/tests/behat/import_course.feature | 4 ++-- .../behat/restore_moodle2_courses.feature | 4 ++-- .../tests/behat/accessreview_results.feature | 10 +++++----- lib/classes/oauth2/service/imsobv2p1.php | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/admin/tool/brickfield/tests/behat/accessresults.feature b/admin/tool/brickfield/tests/behat/accessresults.feature index a0ef172e802..19111296c22 100644 --- a/admin/tool/brickfield/tests/behat/accessresults.feature +++ b/admin/tool/brickfield/tests/behat/accessresults.feature @@ -32,8 +32,8 @@ Feature: Brickfield activityresults And I run the scheduled task "\tool_brickfield\task\bulk_process_caches" And I navigate to "Accessibility toolkit" in current page administration And I should see "Error details: course Course 1" - And I should see "Overall page content length" - And I should see "\"Bold\" (b) elements should not be used" + And I should see "The overall page content length" + And I should see "Bold (b) elements should not be used" And I should see "Link text should be descriptive" And I follow "Activity breakdown" Then I should see "Results per activity: course Course 1" diff --git a/admin/tool/oauth2/tests/behat/basic_settings.feature b/admin/tool/oauth2/tests/behat/basic_settings.feature index 1a258b3bfd7..beb669eab94 100644 --- a/admin/tool/oauth2/tests/behat/basic_settings.feature +++ b/admin/tool/oauth2/tests/behat/basic_settings.feature @@ -142,29 +142,29 @@ Feature: Basic OAuth2 functionality And I should see "Identity issuer deleted" And I should not see "Testing service modified" - Scenario: Create, edit and delete standard service for OpenBadges - Given I press "OpenBadges" - And I should see "Create new service: OpenBadges" + Scenario: Create, edit and delete standard service for Open Badges + Given I press "Open Badges" + And I should see "Create new service: Open Badges" And I set the following fields to these values: | Client ID | thisistheclientid | | Client secret | supersecret | | Service base URL | https://dc.imsglobal.org/ | When I press "Save changes" Then I should see "Changes saved" - And I should see "OpenBadges" - And "Allow services" "icon" should exist in the "OpenBadges" "table_row" - And "Do not allow login" "icon" should exist in the "OpenBadges" "table_row" - And "Service discovery successful" "icon" should exist in the "OpenBadges" "table_row" + And I should see "Open Badges" + And "Allow services" "icon" should exist in the "Open Badges" "table_row" + And "Do not allow login" "icon" should exist in the "Open Badges" "table_row" + And "Service discovery successful" "icon" should exist in the "Open Badges" "table_row" And the "src" attribute of "table.admintable th img" "css_element" should contain "IMS-Global-Logo.png" - And I click on "Configure endpoints" "link" in the "OpenBadges" "table_row" + And I click on "Configure endpoints" "link" in the "Open Badges" "table_row" And I should see "https://dc.imsglobal.org/.well-known/badgeconnect.json" in the "discovery_endpoint" "table_row" And I should see "authorization_endpoint" And I follow "OAuth 2 services" - And I click on "Configure user field mappings" "link" in the "OpenBadges" "table_row" + And I click on "Configure user field mappings" "link" in the "Open Badges" "table_row" And I should not see "given_name" And I should not see "middle_name" And I follow "OAuth 2 services" - And I click on "Edit" "link" in the "OpenBadges" "table_row" + And I click on "Edit" "link" in the "Open Badges" "table_row" And I set the following fields to these values: | Name | IMS Global | And I press "Save changes" diff --git a/backup/upgrade.txt b/backup/upgrade.txt index 825f55bcdde..edb4df9a6cc 100644 --- a/backup/upgrade.txt +++ b/backup/upgrade.txt @@ -3,7 +3,7 @@ information provided here is intended especially for developers. === 3.11 === - * New setting called "Include override permissions" has been implemented. The default + * New setting called "Include permission overrides" has been implemented. The default settings is OFF for import, and ON for restore. === 3.10 === diff --git a/backup/util/ui/tests/behat/import_course.feature b/backup/util/ui/tests/behat/import_course.feature index 55d3271efa3..833f34be381 100644 --- a/backup/util/ui/tests/behat/import_course.feature +++ b/backup/util/ui/tests/behat/import_course.feature @@ -39,7 +39,7 @@ Feature: Import course's contents into another course | enrol/manual:enrol | Allow | teacher | Course | C1 | And I log in as "teacher1" When I import "Course 1" course into "Course 2" course using this options: - | Initial | Include override permissions | 1 | + | Initial | Include permission overrides | 1 | And I navigate to "Users > Permissions" in current page administration Then I should see "Non-editing teacher (1)" And I set the field "Advanced role override" to "Non-editing teacher (1)" @@ -52,6 +52,6 @@ Feature: Import course's contents into another course | enrol/manual:enrol | Allow | teacher | Course | C1 | And I log in as "teacher1" When I import "Course 1" course into "Course 2" course using this options: - | Initial | Include override permissions | 0 | + | Initial | Include permission overrides | 0 | And I navigate to "Users > Permissions" in current page administration Then I should see "Non-editing teacher (0)" diff --git a/backup/util/ui/tests/behat/restore_moodle2_courses.feature b/backup/util/ui/tests/behat/restore_moodle2_courses.feature index fb32d18205a..ce687a7e996 100644 --- a/backup/util/ui/tests/behat/restore_moodle2_courses.feature +++ b/backup/util/ui/tests/behat/restore_moodle2_courses.feature @@ -253,7 +253,7 @@ Feature: Restore Moodle 2 course backups And I backup "Course 1" course using this options: | Confirmation | Filename | test_backup.mbz | When I restore "test_backup.mbz" backup into a new course using this options: - | Settings | Include override permissions | 1 | + | Settings | Include permission overrides | 1 | Then I navigate to "Users > Permissions" in current page administration And I should see "Non-editing teacher (1)" And I set the field "Advanced role override" to "Non-editing teacher (1)" @@ -267,6 +267,6 @@ Feature: Restore Moodle 2 course backups And I backup "Course 1" course using this options: | Confirmation | Filename | test_backup.mbz | When I restore "test_backup.mbz" backup into a new course using this options: - | Settings | Include override permissions | 0 | + | Settings | Include permission overrides | 0 | Then I navigate to "Users > Permissions" in current page administration And I should see "Non-editing teacher (0)" diff --git a/blocks/accessreview/tests/behat/accessreview_results.feature b/blocks/accessreview/tests/behat/accessreview_results.feature index 863eedbb1bd..e0ac084170d 100644 --- a/blocks/accessreview/tests/behat/accessreview_results.feature +++ b/blocks/accessreview/tests/behat/accessreview_results.feature @@ -41,9 +41,9 @@ Feature: Block accessreview results And I should see "1" in the "Link" "table_row" # We created one text issue, and the standard Behat course generator creates another (too much content). And I should see "2" in the "Text" "table_row" - And "View Brickfield accessibility toolkit" "icon" should exist in the "Accessibility review" "block" - And "Toggle Brickfield accessibility heatmap" "icon" should exist in the "Accessibility review" "block" - And "Download Brickfield accessibility summary report" "icon" should exist in the "Accessibility review" "block" + And "View accessibility toolkit" "icon" should exist in the "Accessibility review" "block" + And "Toggle accessibility heatmap" "icon" should exist in the "Accessibility review" "block" + And "Download accessibility summary report" "icon" should exist in the "Accessibility review" "block" Scenario: Toggle highlighting on/off Given I log in as "admin" @@ -61,7 +61,7 @@ Feature: Block accessreview results And I run the scheduled task "\tool_brickfield\task\bulk_process_courses" And I run the scheduled task "\tool_brickfield\task\bulk_process_caches" And I reload the page - And I click on "Toggle Brickfield accessibility heatmap" "icon" + And I click on "Toggle accessibility heatmap" "icon" And ".block_accessreview_view" "css_element" should be visible - And I click on "Toggle Brickfield accessibility heatmap" "icon" + And I click on "Toggle accessibility heatmap" "icon" And ".block_accessreview_view" "css_element" should not be visible diff --git a/lib/classes/oauth2/service/imsobv2p1.php b/lib/classes/oauth2/service/imsobv2p1.php index 80adb3a55c1..2d90e1aede9 100644 --- a/lib/classes/oauth2/service/imsobv2p1.php +++ b/lib/classes/oauth2/service/imsobv2p1.php @@ -35,7 +35,7 @@ class imsobv2p1 extends imsbadgeconnect implements issuer_interface { */ public static function init(): ?issuer { $record = (object) [ - 'name' => 'OpenBadges', + 'name' => 'Open Badges', 'image' => '', 'servicetype' => 'imsobv2p1', ];