diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-07-11 12:11:41 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-07-11 12:11:41 -0700 |
| commit | 59f34bef087259722e1f7eaa95b96460e007cb30 (patch) | |
| tree | d7dfcc712537e672a965d924cac679670d09583e /tests/controller | |
| parent | 7104aeb77e2f6066cbbda0585fc8523426e4b7c7 (diff) | |
| parent | 947b907efef43704c620507db17aff4fe115f219 (diff) | |
| download | forums-59f34bef087259722e1f7eaa95b96460e007cb30.tar forums-59f34bef087259722e1f7eaa95b96460e007cb30.tar.gz forums-59f34bef087259722e1f7eaa95b96460e007cb30.tar.bz2 forums-59f34bef087259722e1f7eaa95b96460e007cb30.tar.xz forums-59f34bef087259722e1f7eaa95b96460e007cb30.zip | |
Merge pull request #1470 from EXreaction/feature/twig
Feature/twig
Diffstat (limited to 'tests/controller')
| -rw-r--r-- | tests/controller/helper_url_test.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/controller/helper_url_test.php b/tests/controller/helper_url_test.php index 2c22700ca6..6686b77e8f 100644 --- a/tests/controller/helper_url_test.php +++ b/tests/controller/helper_url_test.php @@ -45,15 +45,17 @@ class phpbb_controller_helper_url_test extends phpbb_test_case */ public function test_helper_url($route, $params, $is_amp, $session_id, $expected, $description) { - global $phpbb_dispatcher; + global $phpbb_dispatcher, $phpbb_root_path, $phpEx; $phpbb_dispatcher = new phpbb_mock_event_dispatcher; $this->style_resource_locator = new phpbb_style_resource_locator(); $this->user = $this->getMock('phpbb_user'); - $this->template = new phpbb_template($phpbb_root_path, $phpEx, $config, $this->user, $this->style_resource_locator, new phpbb_template_context()); + $this->template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $this->user, new phpbb_template_context()); + $this->style_resource_locator = new phpbb_style_resource_locator(); + $this->style_provider = new phpbb_style_path_provider(); + $this->style = new phpbb_style($phpbb_root_path, $phpEx, new phpbb_config(array()), $this->user, $this->style_resource_locator, $this->style_provider, $this->template); $helper = new phpbb_controller_helper($this->template, $this->user, '', 'php'); $this->assertEquals($helper->url($route, $params, $is_amp, $session_id), $expected); } } - |