mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-03 15:27:42 +02:00
Code Issues Releases Wiki Activity

[ticket/10758-upload] Convert error to a failure.

Browse Source 
PHPBB3-10758
This commit is contained in:
Oleg Pudeyev
2012-12-20 20:27:59 -05:00
parent 31b5f91ea1
commit b6f40f7c33
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/functional/fileupload_form_test.php
View File

@@ -45,7 +45,7 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case
public function test_empty_file() public function test_empty_file()
{ {
$crawler = $this->upload_file('empty.png', 'image/png'); $crawler = $this->upload_file('empty.png', 'image/png');
$this->assertEquals($this->lang('ATTACHED_IMAGE_NOT_IMAGE'), $crawler->filter('div#message p')->text()); $this->assertEquals($this->lang('ATTACHED_IMAGE_NOT_IMAGE'), $this->assert_filter($crawler, 'div#message p')->text());
} }
public function test_invalid_extension() public function test_invalid_extension()

16
tests/test_framework/phpbb_functional_test_case.php
View File

@@ -424,4 +424,20 @@ class phpbb_functional_test_case extends phpbb_test_case
$content = $this->client->getResponse()->getContent(); $content = $this->client->getResponse()->getContent();
$this->assertNotContains('Fatal error:', $content); $this->assertNotContains('Fatal error:', $content);
} }
public function assert_filter($crawler, $expr, $msg = null)
{
$nodes = $crawler->filter($expr);
if ($msg)
{
$msg .= "\n";
}
else
{
$msg = '';
}
$msg .= "`$expr` not found in DOM.";
$this->assertGreaterThan(0, count($nodes), $msg);
return $nodes;
}
} }