aboutsummaryrefslogtreecommitdiffstats
path: root/tests/test_framework
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-05-26 23:57:50 +0200
committerJoas Schilling <nickvergessen@gmx.de>2013-05-27 23:10:07 +0200
commitf25389f94a46bb63d8688be9eef699de9853b4fc (patch)
tree082494bb2e05270387176382c3079966c3bf3d80 /tests/test_framework
parenta3e5efc63483f06c6d66296adbd0538d59a05a21 (diff)
downloadforums-f25389f94a46bb63d8688be9eef699de9853b4fc.tar
forums-f25389f94a46bb63d8688be9eef699de9853b4fc.tar.gz
forums-f25389f94a46bb63d8688be9eef699de9853b4fc.tar.bz2
forums-f25389f94a46bb63d8688be9eef699de9853b4fc.tar.xz
forums-f25389f94a46bb63d8688be9eef699de9853b4fc.zip
[ticket/11568] Any output before the doc type means there was an error
Change is needed to allow "Warning:" in the HTML body PHPBB3-11568
Diffstat (limited to 'tests/test_framework')
-rw-r--r--tests/test_framework/phpbb_functional_test_case.php14
1 files changed, 6 insertions, 8 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index b622c6e284..8a386d1db7 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -447,10 +447,9 @@ class phpbb_functional_test_case extends phpbb_test_case
{
$this->assertEquals(200, $this->client->getResponse()->getStatus());
$content = $this->client->getResponse()->getContent();
- $this->assertNotContains('Fatal error:', $content);
- $this->assertNotContains('Notice:', $content);
- $this->assertNotContains('Warning:', $content);
- $this->assertNotContains('[phpBB Debug]', $content);
+
+ // Any output before the doc type means there was an error
+ $this->assertEquals(0, strpos($content, '<!DOCTYPE'));
}
/**
@@ -465,9 +464,8 @@ class phpbb_functional_test_case extends phpbb_test_case
{
self::assertEquals(200, self::$static_client->getResponse()->getStatus());
$content = self::$static_client->getResponse()->getContent();
- self::assertNotContains('Fatal error:', $content);
- self::assertNotContains('Notice:', $content);
- //@todo: self::assertNotContains('Warning:', $content);
- self::assertNotContains('[phpBB Debug]', $content);
+
+ // Any output before the doc type means there was an error
+ self::assertEquals(0, strpos($content, '<!DOCTYPE'));
}
}