aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-12-14 14:35:20 +0100
committerNils Adermann <naderman@naderman.de>2011-12-14 14:35:20 +0100
commit72eb1ad8cc848192f8f898da0415241c5f023482 (patch)
treecaa9cf44bc8d8544f8b773e4119557e87619e8a0
parent94d954281eee7effb288ff35e4daada5bc5d938c (diff)
parentd4189013ab3c6c9fca7fd79c3137888d169f1d60 (diff)
downloadforums-72eb1ad8cc848192f8f898da0415241c5f023482.tar
forums-72eb1ad8cc848192f8f898da0415241c5f023482.tar.gz
forums-72eb1ad8cc848192f8f898da0415241c5f023482.tar.bz2
forums-72eb1ad8cc848192f8f898da0415241c5f023482.tar.xz
forums-72eb1ad8cc848192f8f898da0415241c5f023482.zip
Merge remote-tracking branch 'github-igorw/feature/functional-tests' into develop
* github-igorw/feature/functional-tests: [feature/functional-tests] Introduce bootstrap method [feature/functional-tests] Make sure functional tests only install once
-rw-r--r--tests/test_framework/phpbb_functional_test_case.php12
1 files changed, 10 insertions, 2 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index a1c642bf38..63b9d52bf0 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -43,6 +43,13 @@ class phpbb_functional_test_case extends phpbb_test_case
return $this->client->request($method, $this->root_url . $path);
}
+ // bootstrap, called after board is set up
+ // once per test case class
+ // test cases can override this
+ protected function bootstrap()
+ {
+ }
+
public function __construct($name = NULL, array $data = array(), $dataName = '')
{
parent::__construct($name, $data, $dataName);
@@ -51,10 +58,11 @@ class phpbb_functional_test_case extends phpbb_test_case
'phpbb_functional_test_case' => array('config', 'already_installed'),
);
- if (!self::$already_installed)
+ if (!static::$already_installed)
{
$this->install_board();
- self::$already_installed = true;
+ $this->bootstrap();
+ static::$already_installed = true;
}
}