From c175333f88a41eee46ccc7b9ea79ec432b7846c4 Mon Sep 17 00:00:00 2001 From: Dan Marsden Date: Wed, 3 Oct 2018 22:30:18 +1300 Subject: [PATCH] Remove incorrect usage of example.com in tests. remove http part of test - site might be https. --- tests/phpunit/base_testcase.php | 4 ---- .../local/controllers/maintenance_static_page_test.php | 10 +++++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/tests/phpunit/base_testcase.php b/tests/phpunit/base_testcase.php index 91a03fd..0e71ed1 100644 --- a/tests/phpunit/base_testcase.php +++ b/tests/phpunit/base_testcase.php @@ -69,9 +69,5 @@ abstract class auth_outage_base_testcase extends advanced_testcase { parent::setUp(); $this->resetAfterTest(true); - - // Do not use https. - $CFG->wwwroot = 'http://www.example.com/moodle'; - $CFG->httpswwwroot = $CFG->wwwroot; } } diff --git a/tests/phpunit/local/controllers/maintenance_static_page_test.php b/tests/phpunit/local/controllers/maintenance_static_page_test.php index d0a630c..4176ee5 100644 --- a/tests/phpunit/local/controllers/maintenance_static_page_test.php +++ b/tests/phpunit/local/controllers/maintenance_static_page_test.php @@ -87,7 +87,7 @@ class maintenance_static_page_test extends auth_outage_base_testcase { 'Content'; $generated = $this->generated_page_html($html); - self::assertContains('http://www.example.com/moodle/auth/outage/file.php?file=', $generated); + self::assertContains('www.example.com/moodle/auth/outage/file.php?file=', $generated); self::assertNotContains($localcsslink, $generated); self::assertContains($externalcsslink, $generated); } @@ -145,7 +145,7 @@ class maintenance_static_page_test extends auth_outage_base_testcase { 'Content'; $generated = $this->generated_page_html($html); - self::assertContains('http://www.example.com/moodle/auth/outage/file.php?file=', $generated); + self::assertContains('www.example.com/moodle/auth/outage/file.php?file=', $generated); self::assertNotContains($localimglink, $generated); self::assertContains($externalimglink, $generated); } @@ -158,7 +158,7 @@ class maintenance_static_page_test extends auth_outage_base_testcase { $generated = $this->generated_page_html($html); self::assertNotContains($link, $generated); - self::assertContains('http://www.example.com/moodle/auth/outage/file.php?file=', $generated); + self::assertContains('www.example.com/moodle/auth/outage/file.php?file=', $generated); } public function test_previewpath() { @@ -172,7 +172,7 @@ class maintenance_static_page_test extends auth_outage_base_testcase { $generated = trim(file_get_contents($page->get_io()->get_template_file())); self::assertNotContains($link, $generated); - self::assertContains('http://www.example.com/moodle/auth/outage/file.php?file=preview%2F', $generated); + self::assertContains('www.example.com/moodle/auth/outage/file.php?file=preview%2F', $generated); } /** @@ -256,7 +256,7 @@ class maintenance_static_page_test extends auth_outage_base_testcase { public function test_get_url_for_file() { $io = new maintenance_static_page_io(); - self::assertSame('http://www.example.com/moodle/auth/outage/file.php?file=img.png', $io->get_url_for_file('img.png')); + self::assertContains('www.example.com/moodle/auth/outage/file.php?file=img.png', $io->get_url_for_file('img.png')); } public function test_is_url() {