Merge branch 'MDL-54025' of https://github.com/stronk7/moodle

diff --cc mod/lti/tests/behat/addtype.feature
index 8f14c67,98da142..ecf14a2
--- 1/mod/lti/tests/behat/addtype.feature
--- 2/mod/lti/tests/behat/addtype.feature
+++ b/mod/lti/tests/behat/addtype.feature
@@@ -24,12 -24,12 +24,12 @@@ Feature: Add preconfigured tools via te
        | Activity name | Test tool activity 1 |
      And I open "Test tool activity 1" actions menu
      And I follow "Edit settings" in the open menu
 -    And I set the field "Launch/Cartridge URL" to local url "/mod/lti/tests/fixtures/ims_cartridge_basic_lti_link.xml"
 +    And I set the field "Launch/cartridge URL" to local url "/mod/lti/tests/fixtures/ims_cartridge_basic_lti_link.xml"
      And I press "Save and return to course"
-     And I open "Example tool" actions menu
+     And I open "Test tool activity 1" actions menu
      And I follow "Edit settings" in the open menu
      And I expand all fieldsets
 -    Then the field "Launch/Cartridge URL" matches value "http://www.example.com/lti/provider.php"
 +    Then the field "Launch/cartridge URL" matches value "http://www.example.com/lti/provider.php"
      And the field "Secure launch URL" matches value "https://www.example.com/lti/provider.php"
      And the field "Icon URL" matches value "http://download.moodle.org/unittest/test.jpg"
      And the field "Secure icon URL" matches value "https://download.moodle.org/unittest/test.jpg"