diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-06-23 20:38:12 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-06-23 20:38:12 +0200 |
| commit | c0699c88f8a53ca35c30bc1747ba32db56ee3e16 (patch) | |
| tree | 25c9131fa457dc275f7ce505119a0727fd75d84a /tests/functional | |
| parent | 22fc5cedbe5f9cf450f8c75a7d03854cacbebf3d (diff) | |
| parent | 83326718132811d8b57ac8612ff50887ec0fa101 (diff) | |
| download | forums-c0699c88f8a53ca35c30bc1747ba32db56ee3e16.tar forums-c0699c88f8a53ca35c30bc1747ba32db56ee3e16.tar.gz forums-c0699c88f8a53ca35c30bc1747ba32db56ee3e16.tar.bz2 forums-c0699c88f8a53ca35c30bc1747ba32db56ee3e16.tar.xz forums-c0699c88f8a53ca35c30bc1747ba32db56ee3e16.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/11528] Change click_submit() to accept id as param
[ticket/11528] Handle case when config file cant be written by installer
[ticket/11528] Change NULL to null
[ticket/11528] Fix spaces and slashes as per guidelines
[ticket/11528] Add asserts in installation steps
[ticket/11528] Use 'use' keyword to import classes to current scope
[ticket/11528] Move parent::tearDown() to end of tearDown()
[ticket/11528] Call parent::tearDown in overrided tearDown method
[ticket/11528] Instantiate $client, $driver from functional test case
[ticket/11528] Refactor install_board() code into a new class
[ticket/11528] Add behat/mink and mink-goutte-driver as dependency
Diffstat (limited to 'tests/functional')
| -rw-r--r-- | tests/functional/fileupload_form_test.php | 2 | ||||
| -rw-r--r-- | tests/functional/fileupload_remote_test.php | 2 | ||||
| -rw-r--r-- | tests/functional/forgot_password_test.php | 2 | ||||
| -rw-r--r-- | tests/functional/plupload_test.php | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/tests/functional/fileupload_form_test.php b/tests/functional/fileupload_form_test.php index cf36a0523f..b9d55fbd3c 100644 --- a/tests/functional/fileupload_form_test.php +++ b/tests/functional/fileupload_form_test.php @@ -42,6 +42,8 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case unlink($fileinfo->getPathname()); } + + parent::tearDown(); } private function upload_file($filename, $mimetype) diff --git a/tests/functional/fileupload_remote_test.php b/tests/functional/fileupload_remote_test.php index f904258a5c..b170fc051f 100644 --- a/tests/functional/fileupload_remote_test.php +++ b/tests/functional/fileupload_remote_test.php @@ -43,6 +43,8 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case global $config, $user; $user = null; $config = array(); + + parent::tearDown(); } public function test_invalid_extension() diff --git a/tests/functional/forgot_password_test.php b/tests/functional/forgot_password_test.php index 64fa19557f..c95efc5b2e 100644 --- a/tests/functional/forgot_password_test.php +++ b/tests/functional/forgot_password_test.php @@ -57,5 +57,7 @@ class phpbb_functional_forgot_password_test extends phpbb_functional_test_case 'config[allow_password_reset]' => 1, )); $crawler = self::submit($form); + + parent::tearDown(); } } diff --git a/tests/functional/plupload_test.php b/tests/functional/plupload_test.php index ee71597ffc..d9faec035c 100644 --- a/tests/functional/plupload_test.php +++ b/tests/functional/plupload_test.php @@ -57,6 +57,8 @@ class phpbb_functional_plupload_test extends phpbb_functional_test_case unlink($fileinfo->getPathname()); } + + parent::tearDown(); } public function get_urls() |