1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 08:25:42 +02:00

Merge remote-tracking branch 'Fyorl/ticket/10992' into develop

* Fyorl/ticket/10992:
  [ticket/10992] Changed octetstream to octet-stream
  [ticket/10992] test_empty_file() now tries to upload the correct file
  [ticket/10992] Modified upload tests to work with new version
This commit is contained in:
Andreas Fischer 2012-07-19 17:08:38 +02:00
commit 415a8c6786

View File

@ -22,41 +22,48 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case
$this->login();
}
private function upload_file($filename, $mimetype)
{
$file = array(
'tmp_name' => $this->path . $filename,
'name' => $filename,
'type' => $mimetype,
'size' => filesize($this->path . $filename),
'error' => UPLOAD_ERR_OK,
);
$crawler = $this->client->request(
'POST',
'posting.php?mode=reply&f=2&t=1&sid=' . $this->sid,
array('add_file' => $this->lang('ADD_FILE')),
array('fileupload' => $file)
);
return $crawler;
}
public function test_empty_file()
{
$crawler = $this->request('GET', 'posting.php?mode=reply&f=2&t=1&sid=' . $this->sid);
$form = $crawler->selectButton('add_file')->form();
$form['fileupload']->upload($this->path . 'empty.png');
$crawler = $this->client->submit($form);
$crawler = $this->upload_file('empty.png', 'image/png');
$this->assertEquals($this->lang('ATTACHED_IMAGE_NOT_IMAGE'), $crawler->filter('div#message p')->text());
}
public function test_invalid_extension()
{
$crawler = $this->request('GET', 'posting.php?mode=reply&f=2&t=1&sid=' . $this->sid);
$form = $crawler->selectButton('add_file')->form();
$form['fileupload']->upload($this->path . 'illegal-extension.bif');
$crawler = $this->client->submit($form);
$crawler = $this->upload_file('illegal-extension.bif', 'application/octet-stream');
$this->assertEquals($this->lang('DISALLOWED_EXTENSION', 'bif'), $crawler->filter('p.error')->text());
}
public function test_too_large()
{
$this->markTestIncomplete('Functional tests use an admin account which ignores maximum upload size.');
$crawler = $this->request('GET', 'posting.php?mode=reply&f=2&t=1&sid=' . $this->sid);
$form = $crawler->selectButton('add_file')->form();
$form['fileupload']->upload($this->path . 'too-large.png');
$crawler = $this->client->submit($form);
$crawler = $this->upload_file('too-large.png', 'image/png');
$this->assertEquals($this->lang('WRONG_FILESIZE', '256', 'KiB'), $crawler->filter('p.error')->text());
}
public function test_valid_file()
{
$crawler = $this->request('GET', 'posting.php?mode=reply&f=2&t=1&sid=' . $this->sid);
$form = $crawler->selectButton('add_file')->form();
$form['fileupload']->upload($this->path . 'valid.jpg');
$crawler = $this->client->submit($form);
$this->assertEquals(0, $crawler->filter('p.error')->count());
$crawler = $this->upload_file('valid.jpg', 'image/jpeg');
$this->assertContains($this->lang('POSTED_ATTACHMENTS'), $crawler->filter('#postform h3')->eq(1)->text());
}
}