makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'ticket/11568' into ticket/11568-develop

Browse source 
* ticket/11568:
  [ticket/11568] Remove unused method
  [ticket/11568] Only assert string when doctype is there at all
This commit is contained in:
Joas Schilling 2013-05-30 14:17:22 +02:00
commit 9e438bd266
1 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
tests/test_framework/phpbb_functional_test_case.php
View file

@ -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"); 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) static private function recreate_database($config)
{ {
$db_conn_mgr = new phpbb_database_test_connection_manager($config); $db_conn_mgr = new phpbb_database_test_connection_manager($config);
@ -626,8 +607,11 @@ class phpbb_functional_test_case extends phpbb_test_case
$content = self::$client->getResponse()->getContent(); $content = self::$client->getResponse()->getContent();
// Any output before the doc type means there was an error // Any output before the doc type means there was an error
if (strpos($content, '<!DOCTYPE') !== false)
{
self::assertStringStartsWith('<!DOCTYPE', trim($content), 'Output found before DOCTYPE specification.'); self::assertStringStartsWith('<!DOCTYPE', trim($content), 'Output found before DOCTYPE specification.');
} }
}
public function assert_filter($crawler, $expr, $msg = null) public function assert_filter($crawler, $expr, $msg = null)
{ {