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

[ticket/11528] Move parent::tearDown() to end of tearDown()

Browse source 
PHPBB3-11528
This commit is contained in:
Dhruv 2014-06-14 17:46:35 +05:30
parent 019b345171
commit c26fa6a15b
6 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/functional/fileupload_form_test.php
View file

@ -27,8 +27,6 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case
public function tearDown() public function tearDown()
{ {
parent::tearDown();
$iterator = new DirectoryIterator(__DIR__ . '/../../phpBB/files/'); $iterator = new DirectoryIterator(__DIR__ . '/../../phpBB/files/');
foreach ($iterator as $fileinfo) foreach ($iterator as $fileinfo)
{ {
@ -44,6 +42,8 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case
unlink($fileinfo->getPathname()); unlink($fileinfo->getPathname());
} }
parent::tearDown();
} }
private function upload_file($filename, $mimetype) private function upload_file($filename, $mimetype)

4
tests/functional/fileupload_remote_test.php
View file

@ -40,11 +40,11 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
public function tearDown() public function tearDown()
{ {
parent::tearDown();
global $config, $user; global $config, $user;
$user = null; $user = null;
$config = array(); $config = array();
parent::tearDown();
} }
public function test_invalid_extension() public function test_invalid_extension()

4
tests/functional/forgot_password_test.php
View file

@ -47,8 +47,6 @@ class phpbb_functional_forgot_password_test extends phpbb_functional_test_case
public function tearDown() public function tearDown()
{ {
parent::tearDown();
$this->login(); $this->login();
$this->admin_login(); $this->admin_login();
@ -59,5 +57,7 @@ class phpbb_functional_forgot_password_test extends phpbb_functional_test_case
'config[allow_password_reset]' => 1, 'config[allow_password_reset]' => 1,
)); ));
$crawler = self::submit($form); $crawler = self::submit($form);
parent::tearDown();
} }
} }

4
tests/functional/plupload_test.php
View file

@ -41,8 +41,6 @@ class phpbb_functional_plupload_test extends phpbb_functional_test_case
public function tearDown() public function tearDown()
{ {
parent::tearDown();
$this->set_extension_group_permission(0); $this->set_extension_group_permission(0);
$iterator = new DirectoryIterator(__DIR__ . '/../../phpBB/files/'); $iterator = new DirectoryIterator(__DIR__ . '/../../phpBB/files/');
foreach ($iterator as $fileinfo) foreach ($iterator as $fileinfo)
@ -59,6 +57,8 @@ class phpbb_functional_plupload_test extends phpbb_functional_test_case
unlink($fileinfo->getPathname()); unlink($fileinfo->getPathname());
} }
parent::tearDown();
} }
public function get_urls() public function get_urls()

3
tests/test_framework/phpbb_functional_test_case.php
View file

@ -117,8 +117,6 @@ class phpbb_functional_test_case extends phpbb_mink_test_case
protected function tearDown() protected function tearDown()
{ {
parent::tearDown();
if ($this->db instanceof \phpbb\db\driver\driver_interface) if ($this->db instanceof \phpbb\db\driver\driver_interface)
{ {
// Close the database connections again this test // Close the database connections again this test
@ -126,6 +124,7 @@ class phpbb_functional_test_case extends phpbb_mink_test_case
} }
self::$cookieJar->clear(); self::$cookieJar->clear();
parent::tearDown();
} }
/** /**

2
tests/test_framework/phpbb_mink_test_case.php
View file

@ -59,8 +59,8 @@ abstract class phpbb_mink_test_case extends phpbb_test_case
protected function tearDown() protected function tearDown()
{ {
parent::tearDown();
self::$session->reset(); self::$session->reset();
parent::tearDown();
} }
static protected function visit($path) static protected function visit($path)