Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.1.x'

Browse Source
This commit is contained in:
Marc Alexander
2015-06-03 15:39:34 +02:00
parent ba684e1025 cddeb1eeac
commit efdfa5a074
28 changed files with 286 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/unit/portal/modules_manager_confirm_box_test.php
View File

@@ -47,14 +47,19 @@ class modules_manager_confirm_box_test extends \board3\portal\tests\testframewor
$request =new \phpbb_mock_request();
$this->request = $request;
$this->user = $user;
$auth = new \phpbb\auth\auth();
$config = new \phpbb\config\config(array());
$controller_helper = new \board3\portal\tests\mock\controller_helper($phpbb_root_path, $phpEx);
$controller_helper->add_route('board3_portal_controller', 'portal');
$modules_helper = new \board3\portal\includes\modules_helper($auth, $config, $controller_helper, $this->request);
$this->portal_helper = new \board3\portal\includes\helper(array(
new \board3\portal\modules\clock($config, null),
new \board3\portal\modules\birthday_list($config, null, $this->db, $user),
new \board3\portal\modules\welcome($config, new \phpbb_mock_request, $this->db, $user, $this->phpbb_root_path, $this->phpEx),
new \board3\portal\modules\donation($config, null, $user),
new \board3\portal\modules\donation($config, $this->request, null, $user, $modules_helper),
));
$this->portal_columns = new \board3\portal\portal\columns();

9
tests/unit/portal/modules_manager_test.php
View File

@@ -41,12 +41,17 @@ class board3_portal_modules_manager_test extends \board3\portal\tests\testframew
$request =new \phpbb_mock_request();
$config = new \phpbb\config\config(array());
$auth = new \phpbb\auth\auth();
$controller_helper = new \board3\portal\tests\mock\controller_helper($phpbb_root_path, $phpEx);
$controller_helper->add_route('board3_portal_controller', 'portal');
$modules_helper = new \board3\portal\includes\modules_helper($auth, $config, $controller_helper, $this->request);
$portal_helper = new \board3\portal\includes\helper(array(
new \board3\portal\modules\clock($config, null),
new \board3\portal\modules\birthday_list($config, null, $this->db, $user),
new \board3\portal\modules\welcome($config, new \phpbb_mock_request, $this->db, $user, $this->phpbb_root_path, $this->phpEx),
new \board3\portal\modules\donation($config, null, $user),
new \board3\portal\modules\donation($config, $request, null, $user, $modules_helper),
));
$this->portal_columns = new \board3\portal\portal\columns();
@@ -108,7 +113,7 @@ class board3_portal_modules_manager_test extends \board3\portal\tests\testframew
$this->modules_manager = new \board3\portal\portal\modules\manager($cache, $db, $this->b3p_controller_helper, $this->portal_columns, $portal_helper, $this->constraints_handler, $this->database_handler, $request, $user);
$portal_modules = obtain_portal_modules();
foreach($portal_modules as $cur_module)
foreach ($portal_modules as $cur_module)
{
$this->constraints_handler->module_column[$cur_module['module_classname']][] = $this->portal_columns->number_to_string($cur_module['module_column']);
}