mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-03 04:55:36 +02:00
Code Issues Releases Wiki Activity

[ticket/10586] more work on getting tests to pass

Browse Source 
PHPBB3-10586
This commit is contained in:
David King 2012-03-18 14:44:37 -04:00
parent 4100b312bb
commit 7d1e4bca33
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/functional/extension_controller_test.php
View File

@ -85,10 +85,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
$phpbb_extension_manager = $this->get_ext_manager();
$phpbb_extension_manager->enable('foobar');
$crawler = $this->request('GET', 'index.php?ext=foobar');
if($this->assertGreaterThan(0, $crawler->filter('#welcome')->count()))
{
$this->assertContains("This is for testing purposes.", $crawler->filter('#welcome')->text());
}
$this->assertContains("This is for testing purposes.", $crawler->filter('#page-body')->text());
$phpbb_extension_manager->purge('foobar');
}
@ -101,11 +98,8 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
$phpbb_extension_manager = $this->get_ext_manager();
$phpbb_extension_manager->enable('foo/bar');
$crawler = $this->request('GET', 'index.php?ext=foo/bar');
if($this->assertGreaterThan(0, $crawler->filter('#welcome')->count()))
{
$this->assertContains("This is for testing purposes.", $crawler->filter('#welcome')->text());
}
$phpbb_extension_manager->purge('foo_bar');
$this->assertContains("This is for testing purposes.", $crawler->filter('#page-body')->text());
$phpbb_extension_manager->purge('foo/bar');
}
/**
@ -118,7 +112,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
$phpbb_extension_manager->enable('error/class');
$crawler = $this->request('GET', 'index.php?ext=error/class');
$this->assertContains("The extension error/class is missing a controller class and cannot be accessed through the front-end.", $crawler->filter('#message')->text());
$phpbb_extension_manager->purge('error_class');
$phpbb_extension_manager->purge('error/class');
}
/**
@ -131,7 +125,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
$phpbb_extension_manager->enable('error/classtype');
$crawler = $this->request('GET', 'index.php?ext=error/classtype');
$this->assertContains("The extension controller class phpbb_ext_error_classtype_controller is not an instance of the phpbb_extension_controller_interface.", $crawler->filter('#message')->text());
$phpbb_extension_manager->purge('error_classtype');
$phpbb_extension_manager->purge('error/classtype');
}
/**

2
tests/test_framework/phpbb_functional_test_case.php
View File

@ -89,7 +89,7 @@ class phpbb_functional_test_case extends phpbb_test_case
{
global $phpbb_root_path, $phpEx;
return new phpbb_extension_manager($this->get_db(), self::$config['table_prefix'] . 'ext', $phpbb_root_path, ".$phpEx", new phpbb_cache_driver_null);
return new phpbb_extension_manager($this->get_db(), self::$config['table_prefix'] . 'ext', $phpbb_root_path, ".$phpEx", new phpbb_cache_driver_file);
}
protected function install_board()

8
tests/test_framework/phpbb_test_case_helpers.php
View File

@ -81,7 +81,7 @@ class phpbb_test_case_helpers
$config['phpbb_functional_url'] = $phpbb_functional_url;
}
if (isset($phpbb_functional_path))
if (!empty($phpbb_functional_path))
{
$config['phpbb_functional_path'] = $phpbb_functional_path;
}
@ -106,11 +106,9 @@ class phpbb_test_case_helpers
));
}
if (isset($_SERVER['PHPBB_FUNCTIONAL_PATH']))
if (!empty($_SERVER['PHPBB_FUNCTIONAL_PATH']))
{
$config = array_merge($config, array(
'phpbb_functional_path' => isset($_SERVER['PHPBB_FUNCTIONAL_PATH']) ? $_SERVER['PHPBB_FUNCTIONAL_PATH'] : '',
));
$config['phpbb_functional_path'] = $_SERVER['PHPBB_FUNCTIONAL_PATH'];
}
return $config;