Merge branch 'MDL-77461-311' of https://github.com/andrewnicols/moodle …

…into MOODLE_311_STABLE

lib/tests/behat/behat_navigation.php

@@ -734,8 +734,6 @@ protected function resolve_core_page_url(string $name): moodle_url {
      * @throws Exception with a meaningful error message if the specified page cannot be found.
      */
     protected function resolve_core_page_instance_url(string $type, string $identifier): moodle_url {
-        global $DB;
-
         $type = strtolower($type);
 
         switch ($type) {
@@ -819,9 +817,8 @@ protected function resolve_core_page_instance_url(string $type, string $identifi
      * @return void
      */
     public function i_am_on_course_homepage($coursefullname) {
-        global $DB;
-        $course = $DB->get_record("course", array("fullname" => $coursefullname), 'id', MUST_EXIST);
-        $url = new moodle_url('/course/view.php', ['id' => $course->id]);
+        $courseid = $this->get_course_id($coursefullname);
+        $url = new moodle_url('/course/view.php', ['id' => $courseid]);
         $this->execute('behat_general::i_visit', [$url]);
     }
 
@@ -834,10 +831,8 @@ public function i_am_on_course_homepage($coursefullname) {
      * @return void
      */
     public function i_am_on_course_homepage_with_editing_mode_on($coursefullname) {
-        global $DB;
-
-        $course = $DB->get_record("course", array("fullname" => $coursefullname), 'id', MUST_EXIST);
-        $url = new moodle_url('/course/view.php', ['id' => $course->id]);
+        $courseid = $this->get_course_id($coursefullname);
+        $url = new moodle_url('/course/view.php', ['id' => $courseid]);
 
         if ($this->running_javascript() && $sesskey = $this->get_sesskey()) {
             // Javascript is running so it is possible to grab the session ket and jump straight to editing mode.