diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2014-06-14 17:46:35 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2014-06-23 01:26:17 +0530 |
| commit | c26fa6a15b716dcf43d063b41ec5d646fc115e19 (patch) | |
| tree | c6b9113049dab52dd6aafe19a1604aa246b4c803 /tests/test_framework | |
| parent | 019b345171d271535b32b09f82ad24c16ec8b0b8 (diff) | |
| download | forums-c26fa6a15b716dcf43d063b41ec5d646fc115e19.tar forums-c26fa6a15b716dcf43d063b41ec5d646fc115e19.tar.gz forums-c26fa6a15b716dcf43d063b41ec5d646fc115e19.tar.bz2 forums-c26fa6a15b716dcf43d063b41ec5d646fc115e19.tar.xz forums-c26fa6a15b716dcf43d063b41ec5d646fc115e19.zip | |
[ticket/11528] Move parent::tearDown() to end of tearDown()
PHPBB3-11528
Diffstat (limited to 'tests/test_framework')
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 3 | ||||
| -rw-r--r-- | tests/test_framework/phpbb_mink_test_case.php | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 6ce5d92ee1..5e1cf9b31f 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -117,8 +117,6 @@ class phpbb_functional_test_case extends phpbb_mink_test_case protected function tearDown() { - parent::tearDown(); - if ($this->db instanceof \phpbb\db\driver\driver_interface) { // Close the database connections again this test @@ -126,6 +124,7 @@ class phpbb_functional_test_case extends phpbb_mink_test_case } self::$cookieJar->clear(); + parent::tearDown(); } /** diff --git a/tests/test_framework/phpbb_mink_test_case.php b/tests/test_framework/phpbb_mink_test_case.php index 555574e053..86ac9feb09 100644 --- a/tests/test_framework/phpbb_mink_test_case.php +++ b/tests/test_framework/phpbb_mink_test_case.php @@ -59,8 +59,8 @@ abstract class phpbb_mink_test_case extends phpbb_test_case protected function tearDown() { - parent::tearDown(); self::$session->reset(); + parent::tearDown(); } static protected function visit($path) |