diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-05-30 14:17:22 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-05-30 14:17:22 +0200 |
| commit | 9e438bd266b07019f6295adeb9a6df40d476c9f1 (patch) | |
| tree | e400e51dc0f2bfd257d298ede0fcaf3f3ccdebc8 | |
| parent | a36defb10fd8962d6073bfafd0cab1b7e15fbbda (diff) | |
| parent | b4d23fa5519d4c0baa562990cf48ed058473fed4 (diff) | |
| download | forums-9e438bd266b07019f6295adeb9a6df40d476c9f1.tar forums-9e438bd266b07019f6295adeb9a6df40d476c9f1.tar.gz forums-9e438bd266b07019f6295adeb9a6df40d476c9f1.tar.bz2 forums-9e438bd266b07019f6295adeb9a6df40d476c9f1.tar.xz forums-9e438bd266b07019f6295adeb9a6df40d476c9f1.zip | |
Merge branch 'ticket/11568' into ticket/11568-develop
* ticket/11568:
[ticket/11568] Remove unused method
[ticket/11568] Only assert string when doctype is there at all
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index e5e08df5fc..92f777c4d7 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -318,25 +318,6 @@ class phpbb_functional_test_case extends phpbb_test_case copy($phpbb_root_path . "config.$phpEx", $phpbb_root_path . "config_test.$phpEx"); } - static private function do_request($sub, $post_data = null) - { - $context = null; - - if ($post_data) - { - $context = stream_context_create(array( - 'http' => array( - 'method' => 'POST', - 'header' => 'Content-Type: application/x-www-form-urlencoded', - 'content' => http_build_query($post_data), - 'ignore_errors' => true, - ), - )); - } - - return file_get_contents(self::$config['phpbb_functional_url'] . 'install/index.php?mode=install&sub=' . $sub, false, $context); - } - static private function recreate_database($config) { $db_conn_mgr = new phpbb_database_test_connection_manager($config); @@ -626,7 +607,10 @@ class phpbb_functional_test_case extends phpbb_test_case $content = self::$client->getResponse()->getContent(); // Any output before the doc type means there was an error - self::assertStringStartsWith('<!DOCTYPE', trim($content), 'Output found before DOCTYPE specification.'); + if (strpos($content, '<!DOCTYPE') !== false) + { + self::assertStringStartsWith('<!DOCTYPE', trim($content), 'Output found before DOCTYPE specification.'); + } } public function assert_filter($crawler, $expr, $msg = null) |