mirror/moodle-auth_outage
1
0
Fork 0
mirror of https://github.com/catalyst/moodle-auth_outage.git synced 2026-05-17 05:48:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fixphpunit' into MOODLE_39_STABLE

Browse Source
This commit is contained in:
Dan Marsden
2021-05-06 10:03:06 +12:00
parent baa7138a01 802acbd26c
commit 50511d1e46
9 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/phpunit/installation_test.php
View File

@@ -71,7 +71,7 @@ class installation_test extends auth_outage_base_testcase {
$progress = new progress_trace_buffer(new text_progress_trace(), false);
core_plugin_manager::instance()->uninstall_plugin('auth_outage', $progress);
$progress->finished();
self::assertContains('++ Success ++', $progress->get_buffer());
self::assertStringContainsString('++ Success ++', $progress->get_buffer());
// Check ...
self::assertSame(0, $DB->count_records_select('event', "eventtype = 'auth_outage'", null),

4
tests/phpunit/local/cli/cli_test.php
View File

@@ -81,8 +81,8 @@ class cli_test extends auth_outage_cli_testcase {
$this->set_parameters(['-h']);
$cli = new create();
$output = $this->execute($cli);
self::assertContains('-h', $output);
self::assertContains('--help', $output);
self::assertStringContainsString('-h', $output);
self::assertStringContainsString('--help', $output);
}
/**

12
tests/phpunit/local/cli/create_test.php
View File

@@ -120,8 +120,8 @@ class create_test extends auth_outage_cli_testcase {
$this->set_parameters(['--help']);
$cli = new create();
$output = $this->execute($cli);
self::assertContains('Creates', $output);
self::assertContains('--help', $output);
self::assertStringContainsString('Creates', $output);
self::assertStringContainsString('--help', $output);
}
/**
@@ -157,7 +157,7 @@ class create_test extends auth_outage_cli_testcase {
$cli = new create();
$cli->set_referencetime($now);
$text = $this->execute($cli);
self::assertContains('created', $text);
self::assertStringContainsString('created', $text);
// Check creted outage.
list(, $id) = explode(':', $text);
$id = (int)$id;
@@ -221,7 +221,7 @@ class create_test extends auth_outage_cli_testcase {
'description' => 'Default Description',
]);
$text = $this->execute($cli);
self::assertContains('created', $text);
self::assertStringContainsString('created', $text);
// Check creted outage.
list(, $id) = explode(':', $text);
$id = (int)$id;
@@ -299,8 +299,8 @@ class create_test extends auth_outage_cli_testcase {
$cli = new create();
$cli->set_referencetime($now);
$text = $this->execute($cli);
self::assertContains('created', $text);
self::assertContains('started', $text);
self::assertStringContainsString('created', $text);
self::assertStringContainsString('started', $text);
}
/**

4
tests/phpunit/local/cli/finish_test.php
View File

@@ -72,8 +72,8 @@ class finish_test extends auth_outage_cli_testcase {
$this->set_parameters(['--help']);
$cli = new finish();
$text = $this->execute($cli);
self::assertContains('Finishes', $text);
self::assertContains('--help', $text);
self::assertStringContainsString('Finishes', $text);
self::assertStringContainsString('--help', $text);
}
/**

20
tests/phpunit/local/cli/waitforit_test.php
View File

@@ -78,8 +78,8 @@ class waitforit_test extends auth_outage_cli_testcase {
$this->set_parameters(['--help']);
$cli = new waitforit();
$text = $this->execute($cli);
self::assertContains('Waits', $text);
self::assertContains('--help', $text);
self::assertStringContainsString('Waits', $text);
self::assertStringContainsString('--help', $text);
}
/**
@@ -151,9 +151,9 @@ class waitforit_test extends auth_outage_cli_testcase {
$cli = new waitforit();
$cli->set_referencetime($now);
$output = $this->execute($cli);
self::assertContains('Verbose mode', $output);
self::assertContains('starting in 1 sec', $output);
self::assertContains('started', $output);
self::assertStringContainsString('Verbose mode', $output);
self::assertStringContainsString('starting in 1 sec', $output);
self::assertStringContainsString('started', $output);
}
/**
@@ -178,11 +178,11 @@ class waitforit_test extends auth_outage_cli_testcase {
return $now;
});
$output = $this->execute($cli);
self::assertContains("starting in 45", $output);
self::assertContains("sleep 30 second", $output);
self::assertContains("starting in 15", $output);
self::assertContains("sleep 15 second", $output);
self::assertContains("started!", $output);
self::assertStringContainsString("starting in 45", $output);
self::assertStringContainsString("sleep 30 second", $output);
self::assertStringContainsString("starting in 15", $output);
self::assertStringContainsString("sleep 15 second", $output);
self::assertStringContainsString("started!", $output);
}
/**

2
tests/phpunit/local/controllers/infopage_test.php
View File

@@ -103,7 +103,7 @@ class infopagecontroller_test extends auth_outage_base_testcase {
]);
$info = new infopage(['outage' => $outage]);
$output = $info->get_output();
self::assertContains('auth_outage_info', $output);
self::assertStringContainsString('auth_outage_info', $output);
}
/**

60
tests/phpunit/local/controllers/maintenance_static_page_test.php
View File

@@ -90,7 +90,7 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
maintenance_static_page::create_from_html($html)->generate();
$generated = $this->generated_page_html($html);
self::assertNotContains('<script', $generated);
self::assertStringNotContainsString('<script', $generated);
}
/**
@@ -104,9 +104,9 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
'<body>Content<link rel="stylesheet" href="'.$externalcsslink.'"></body></html>';
$generated = $this->generated_page_html($html);
self::assertContains('www.example.com/moodle/auth/outage/file.php?file=', $generated);
self::assertNotContains($localcsslink, $generated);
self::assertContains($externalcsslink, $generated);
self::assertStringContainsString('www.example.com/moodle/auth/outage/file.php?file=', $generated);
self::assertStringNotContainsString($localcsslink, $generated);
self::assertStringContainsString($externalcsslink, $generated);
}
/**
@@ -174,9 +174,9 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
'<body><img src="'.$localimglink.'">Content<img src="'.$externalimglink.'" /></body></html>';
$generated = $this->generated_page_html($html);
self::assertContains('www.example.com/moodle/auth/outage/file.php?file=', $generated);
self::assertNotContains($localimglink, $generated);
self::assertContains($externalimglink, $generated);
self::assertStringContainsString('www.example.com/moodle/auth/outage/file.php?file=', $generated);
self::assertStringNotContainsString($localimglink, $generated);
self::assertStringContainsString($externalimglink, $generated);
}
/**
@@ -189,8 +189,8 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
'<body>Content</body></html>';
$generated = $this->generated_page_html($html);
self::assertNotContains($link, $generated);
self::assertContains('www.example.com/moodle/auth/outage/file.php?file=', $generated);
self::assertStringNotContainsString($link, $generated);
self::assertStringContainsString('www.example.com/moodle/auth/outage/file.php?file=', $generated);
}
/**
@@ -206,8 +206,8 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
$page->generate();
$generated = trim(file_get_contents($page->get_io()->get_template_file()));
self::assertNotContains($link, $generated);
self::assertContains('www.example.com/moodle/auth/outage/file.php?file=preview%2F', $generated);
self::assertStringNotContainsString($link, $generated);
self::assertStringContainsString('www.example.com/moodle/auth/outage/file.php?file=preview%2F', $generated);
}
/**
@@ -303,7 +303,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::assertContains('www.example.com/moodle/auth/outage/file.php?file=img.png', $io->get_url_for_file('img.png'));
self::assertStringContainsString('www.example.com/moodle/auth/outage/file.php?file=img.png', $io->get_url_for_file('img.png'));
}
/**
@@ -370,8 +370,8 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
set_config('remove_selectors', '.removeme', 'auth_outage');
$generated = $this->generated_page_html($html);
self::assertNotContains('removeme', $generated);
self::assertNotContains('Goodbye cruel world', $generated);
self::assertStringNotContainsString('removeme', $generated);
self::assertStringNotContainsString('Goodbye cruel world', $generated);
}
/**
@@ -385,8 +385,8 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
set_config('remove_selectors', '#removeme', 'auth_outage');
$generated = $this->generated_page_html($html);
self::assertNotContains('removeme', $generated);
self::assertNotContains('Goodbye cruel world', $generated);
self::assertStringNotContainsString('removeme', $generated);
self::assertStringNotContainsString('Goodbye cruel world', $generated);
}
/**
@@ -403,9 +403,9 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
set_config('remove_selectors', ".removeme\n.deleteme", 'auth_outage');
$generated = $this->generated_page_html($html);
self::assertNotContains('removeme', $generated);
self::assertNotContains('deleteme', $generated);
self::assertNotContains('Goodbye cruel world', $generated);
self::assertStringNotContainsString('removeme', $generated);
self::assertStringNotContainsString('deleteme', $generated);
self::assertStringNotContainsString('Goodbye cruel world', $generated);
}
/**
@@ -422,9 +422,9 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
set_config('remove_selectors', " .removeme \n .deleteme ", 'auth_outage');
$generated = $this->generated_page_html($html);
self::assertNotContains('removeme', $generated);
self::assertNotContains('deleteme', $generated);
self::assertNotContains('Goodbye cruel world', $generated);
self::assertStringNotContainsString('removeme', $generated);
self::assertStringNotContainsString('deleteme', $generated);
self::assertStringNotContainsString('Goodbye cruel world', $generated);
}
/**
@@ -441,9 +441,9 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
set_config('remove_selectors', "\n\n.removeme\n\n\n\n.deleteme\n\n", 'auth_outage');
$generated = $this->generated_page_html($html);
self::assertNotContains('removeme', $generated);
self::assertNotContains('deleteme', $generated);
self::assertNotContains('Goodbye cruel world', $generated);
self::assertStringNotContainsString('removeme', $generated);
self::assertStringNotContainsString('deleteme', $generated);
self::assertStringNotContainsString('Goodbye cruel world', $generated);
}
/**
@@ -457,8 +457,8 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
set_config('remove_selectors', '#invalidid', 'auth_outage');
$generated = $this->generated_page_html($html);
self::assertContains('removeme', $generated);
self::assertContains('Goodbye cruel world', $generated);
self::assertStringContainsString('removeme', $generated);
self::assertStringContainsString('Goodbye cruel world', $generated);
}
/**
@@ -472,7 +472,7 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
set_config('remove_selectors', '#invalidid', 'auth_outage');
$generated = $this->generated_page_html($html);
self::assertContains('<meta http-equiv="refresh" content="300">', $generated);
self::assertStringContainsString('<meta http-equiv="refresh" content="300">', $generated);
}
/**
@@ -490,7 +490,7 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
$generated = trim(file_get_contents($page->get_io()->get_template_file()));
return $generated;
self::assertContains('<meta http-equiv="refresh" content="5">', $generated);
self::assertStringContainsString('<meta http-equiv="refresh" content="5">', $generated);
}
/**
@@ -529,7 +529,7 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
$generator = new maintenance_static_page_generator(new DOMDocument(), new maintenance_static_page_io());
$matches = $generator->get_urls_from_stylesheet($filecontent);
self::assertInternalType('array', $matches);
self::assertIsArray($matches);
self::assertCount(2, $matches);
self::assertCount($count, $matches[1]);
}

8
tests/phpunit/local/outage_test.php
View File

@@ -280,11 +280,11 @@ class outage_test extends auth_outage_base_testcase {
'description' => 'Description {{start}} {{stop}} {{duration}}',
]);
$title = $outage->get_title();
self::assertNotContains('{', $title);
self::assertNotContains('}', $title);
self::assertStringNotContainsString('{', $title);
self::assertStringNotContainsString('}', $title);
$description = $outage->get_description();
self::assertNotContains('{', $description);
self::assertNotContains('}', $description);
self::assertStringNotContainsString('{', $description);
self::assertStringNotContainsString('}', $description);
}
/**

10
tests/phpunit/local/outagelib_test.php
View File

@@ -99,14 +99,14 @@ class outagelib_test extends auth_outage_base_testcase {
outagelib::reset_injectcalled();
// Get full header to avoid interactions with other single inject plugins.
$header1 = $OUTPUT->standard_top_of_body_html();
self::assertContains('<style>', $header1);
self::assertContains('<script>', $header1);
self::assertStringContainsString('<style>', $header1);
self::assertStringContainsString('<script>', $header1);
// Should not inject more than once.
$size = strlen($OUTPUT->standard_top_of_body_html());
self::assertSame($size, strlen($OUTPUT->standard_top_of_body_html()));
// Check styles aren't reinjected.
self::assertNotContains('<style>', $OUTPUT->standard_top_of_body_html());
self::assertStringNotContainsString('<style>', $OUTPUT->standard_top_of_body_html());
}
/**
@@ -142,8 +142,8 @@ class outagelib_test extends auth_outage_base_testcase {
outagelib::reset_injectcalled();
$header = outagelib::get_inject_code();
self::assertContains('<style>', $header);
self::assertContains('<script>', $header);
self::assertStringContainsString('<style>', $header);
self::assertStringContainsString('<script>', $header);
}
/**