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

Merge pull request #653 from marc1706/ticket/652

Browse Source 
[ticket/652] Fix test failures caused by latest changes to phpBB's master
This commit is contained in:
Marc Alexander
2015-09-14 18:38:12 +02:00
parent 2799ba6762 e4e5141978
commit 6b179d204b
8 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/unit/acp/move_module_test.php
View File

@@ -112,7 +112,7 @@ class phpbb_acp_move_module_test extends \board3\portal\tests\testframework\data
new \phpbb\symfony_request(
new \phpbb_mock_request()
),
new \phpbb\filesystem(),
new \phpbb\filesystem\filesystem(),
new \phpbb_mock_request(),
$phpbb_root_path,
$phpEx

2
tests/unit/controller/helper_test.php
View File

@@ -52,7 +52,7 @@ class helper_test extends \board3\portal\tests\testframework\test_case
new \phpbb\symfony_request(
new \phpbb_mock_request()
),
new \phpbb\filesystem(),
new \phpbb\filesystem\filesystem(),
new \phpbb_mock_request(),
$this->phpbb_root_path,
$this->php_ext

2
tests/unit/controller/main_test.php
View File

@@ -35,7 +35,7 @@ class main_test extends \board3\portal\tests\testframework\database_test_case
new \phpbb\symfony_request(
new \phpbb_mock_request()
),
new \phpbb\filesystem(),
new \phpbb\filesystem\filesystem(),
new \phpbb_mock_request(),
$phpbb_root_path,
$phpEx

8
tests/unit/event/listener_test.php
View File

@@ -58,7 +58,7 @@ class listener_test extends \phpbb_template_template_test_case
$manager = new \phpbb_mock_extension_manager(dirname(__FILE__) . '/', array());
$finder = new \phpbb\finder(
new \phpbb\filesystem(),
new \phpbb\filesystem\filesystem(),
dirname(__FILE__) . '/',
new \phpbb_mock_cache()
);
@@ -79,13 +79,15 @@ class listener_test extends \phpbb_template_template_test_case
$router = new \phpbb_mock_router($container, $filesystem, dirname(__FILE__) . '/', 'php', PHPBB_ENVIRONMENT, $manager);
$router->find_routing_files($manager->all_enabled(false));
$router->find(dirname(__FILE__) . '/');
$this->controller_helper = new mock_controller_helper($this->template, $this->user, $this->config, $router, new \phpbb\symfony_request($request), $request, new \phpbb\filesystem(), '', 'php', dirname(__FILE__) . '/');
$symfony_request = new \phpbb\symfony_request($request);
$routing_helper = new \phpbb\routing\helper($this->config, $router, $symfony_request, $request, $filesystem, $phpbb_root_path, 'php');
$this->controller_helper = new mock_controller_helper($this->template, $this->user, $this->config, $symfony_request, $request, $routing_helper);
$this->path_helper = new \phpbb\path_helper(
new \phpbb\symfony_request(
new \phpbb_mock_request()
),
new \phpbb\filesystem(),
new \phpbb\filesystem\filesystem(),
new \phpbb_mock_request(),
$this->phpbb_root_path,
$this->php_ext

2
tests/unit/modules/calendar_test.php
View File

@@ -44,7 +44,7 @@ class phpbb_unit_modules_calendar_test extends \board3\portal\tests\testframewor
new \phpbb\symfony_request(
new \phpbb_mock_request()
),
new \phpbb\filesystem(),
new \phpbb\filesystem\filesystem(),
new \phpbb_mock_request(),
$phpbb_root_path,
'php'

3
tests/unit/modules/welcome_test.php
View File

@@ -40,7 +40,7 @@ class phpbb_unit_modules_welcome_test extends \board3\portal\tests\testframework
parent::setUp();
global $cache, $phpbb_root_path, $phpEx, $phpbb_dispatcher, $request, $config, $phpbb_container;
$config = $this->config = new \phpbb\config\config(array());
$config = $this->config = new \phpbb\config\config(array('allowed_schemes_links' => 'http,https,ftp'));
$this->request = new \phpbb_mock_request();
$request = $this->request;
$this->template = new \board3\portal\tests\mock\template($this);
@@ -77,6 +77,7 @@ class phpbb_unit_modules_welcome_test extends \board3\portal\tests\testframework
new \phpbb\textformatter\data_access($this->db, BBCODES_TABLE, SMILIES_TABLE, STYLES_TABLE, WORDS_TABLE, $phpbb_root_path . 'styles/'),
new \phpbb\cache\driver\dummy(),
$phpbb_dispatcher,
$config,
$phpbb_root_path . 'cache',
'_text_formatter_parser',
'_text_formatter_renderer'

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

@@ -94,7 +94,7 @@ class modules_manager_confirm_box_test extends \board3\portal\tests\testframewor
new \phpbb\symfony_request(
new \phpbb_mock_request()
),
new \phpbb\filesystem(),
new \phpbb\filesystem\filesystem(),
new \phpbb_mock_request(),
$phpbb_root_path,
$phpEx

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

@@ -89,7 +89,7 @@ class board3_portal_modules_manager_test extends \board3\portal\tests\testframew
new \phpbb\symfony_request(
new \phpbb_mock_request()
),
new \phpbb\filesystem(),
new \phpbb\filesystem\filesystem(),
new \phpbb_mock_request(),
$phpbb_root_path,
$phpEx