MDL-58428 renderer: Correct paths & xpaths

rudivdme · Feb 26, 2019 · f38a9ca · f38a9ca
1 parent 847b0fa
commit f38a9ca
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 486 deletions.
diff --git a/enrol/self/tests/self_test.php b/enrol/self/tests/self_test.php
@@ -602,8 +602,8 @@ public function test_can_self_enrol() {
         $selfplugin->enrol_user($instance1, $user2->id, $editingteacherrole->id);
 
         $this->setUser($guest);
-        $noaccesshtml = get_string('noguestaccess', 'enrol') . $OUTPUT->continue_button(get_login_url());
-        $this->assertSame($noaccesshtml, $selfplugin->can_self_enrol($instance1, true));
+        $this->assertContains(get_string('noguestaccess', 'enrol'),
+                $selfplugin->can_self_enrol($instance1, true));
 
         $this->setUser($user1);
         $this->assertTrue($selfplugin->can_self_enrol($instance1, true));

diff --git a/grade/tests/importlib_test.php b/grade/tests/importlib_test.php
@@ -194,15 +194,11 @@ public function test_grade_import_commit() {
             'itemid' => $gradeitem->id
         ));
 
-        $url = $CFG->wwwroot . '/grade/index.php';
-        $expectedresponse = "++ Grade import success ++
-<div class=\"continuebutton\"><form method=\"get\" action=\"$url\"><div><input type=\"submit\" value=\"Continue\" /><input type=\"hidden\" name=\"id\" value=\"$course->id\" /></div></form></div>";
-
         ob_start();
         $status = grade_import_commit($course->id, $importcode);
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertTrue($status);
-        $this->assertEquals($expectedresponse, $output);
+        $this->assertContains("++ Grade import success ++", $output);
     }
 }