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

[ticket/10491] Move board installation into setup before class.

Browse source 
Functional posting test already assumed that board is installed
once per test case and not once per test.

PHPBB3-10491
This commit is contained in:
Oleg Pudeyev 2012-12-04 17:37:46 -05:00
parent bdc3ddf2bc
commit 38d2868ba8
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
tests/test_framework/phpbb_functional_test_case.php
View file

@ -31,7 +31,6 @@ class phpbb_functional_test_case extends phpbb_test_case
protected $lang = array(); protected $lang = array();
static protected $config = array(); static protected $config = array();
static protected $already_installed = false;
static public function setUpBeforeClass() static public function setUpBeforeClass()
{ {
@ -43,18 +42,15 @@ class phpbb_functional_test_case extends phpbb_test_case
{ {
self::markTestSkipped('phpbb_functional_url was not set in test_config and wasn\'t set as PHPBB_FUNCTIONAL_URL environment variable either.'); self::markTestSkipped('phpbb_functional_url was not set in test_config and wasn\'t set as PHPBB_FUNCTIONAL_URL environment variable either.');
} }
self::install_board();
} }
public function setUp() public function setUp()
{ {
parent::setUp(); parent::setUp();
if (!static::$already_installed) $this->bootstrap();
{
$this->install_board();
$this->bootstrap();
static::$already_installed = true;
}
$this->cookieJar = new CookieJar; $this->cookieJar = new CookieJar;
$this->client = new Goutte\Client(array(), null, $this->cookieJar); $this->client = new Goutte\Client(array(), null, $this->cookieJar);
@ -109,12 +105,12 @@ class phpbb_functional_test_case extends phpbb_test_case
); );
} }
protected function install_board() static protected function install_board()
{ {
global $phpbb_root_path, $phpEx; global $phpbb_root_path, $phpEx;
self::$config['table_prefix'] = 'phpbb_'; self::$config['table_prefix'] = 'phpbb_';
$this->recreate_database(self::$config); self::recreate_database(self::$config);
if (file_exists($phpbb_root_path . "config.$phpEx")) if (file_exists($phpbb_root_path . "config.$phpEx"))
{ {
@ -159,20 +155,20 @@ class phpbb_functional_test_case extends phpbb_test_case
)); ));
// end data // end data
$content = $this->do_request('install'); $content = self::do_request('install');
$this->assertNotSame(false, $content); self::assertNotSame(false, $content);
$this->assertContains('Welcome to Installation', $content); self::assertContains('Welcome to Installation', $content);
$this->do_request('create_table', $data); self::do_request('create_table', $data);
$this->do_request('config_file', $data); self::do_request('config_file', $data);
file_put_contents($phpbb_root_path . "config.$phpEx", phpbb_create_config_file_data($data, self::$config['dbms'], array(), true, true)); file_put_contents($phpbb_root_path . "config.$phpEx", phpbb_create_config_file_data($data, self::$config['dbms'], array(), true, true));
$this->do_request('final', $data); self::do_request('final', $data);
copy($phpbb_root_path . "config.$phpEx", $phpbb_root_path . "config_test.$phpEx"); copy($phpbb_root_path . "config.$phpEx", $phpbb_root_path . "config_test.$phpEx");
} }
private function do_request($sub, $post_data = null) static private function do_request($sub, $post_data = null)
{ {
$context = null; $context = null;