diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-09-16 21:33:52 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-09-16 21:33:52 +0200 |
| commit | 6ba2fb6d62bb1429665f9e1b4f22dd241508950b (patch) | |
| tree | cb6e143bf0bf7d8d35911e2682a5d12c441b2d0e /tests/template/template_events_test.php | |
| parent | ae6f37d559a71fb115cdb954452ebab5fb8fc69f (diff) | |
| parent | cd141883a59ca474c844f9e206333dbd79699695 (diff) | |
| download | forums-6ba2fb6d62bb1429665f9e1b4f22dd241508950b.tar forums-6ba2fb6d62bb1429665f9e1b4f22dd241508950b.tar.gz forums-6ba2fb6d62bb1429665f9e1b4f22dd241508950b.tar.bz2 forums-6ba2fb6d62bb1429665f9e1b4f22dd241508950b.tar.xz forums-6ba2fb6d62bb1429665f9e1b4f22dd241508950b.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11832' into develop
* EXreaction/ticket/11832:
[ticket/11832] Correct paths in tests
[ticket/11832] Correct ROOT_PATH variable
[ticket/11832] get_url() from phpbb_template_asset should return web path
[ticket/11832] Fix INCLUDE(JS/CSS)
[ticket/11832] Fix constructions of phpbb_filesystem
[ticket/11832] Fix smiley paths
[ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request
[ticket/11832] Fix build_url and the S_LOGIN_ACTION
[ticket/11832] Changing comments to say app.php rather than index.php
[ticket/11832] We must instantiate the $phpbb_filesystem in common
[ticket/11832] Fix the web path corrections
[ticket/11832] More extensive testing
[ticket/11832] Use dirname(__FILE__)
[ticket/11832] Use $phpbb_filesystem instead of the container in append_sid
Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework"
[ticket/11832] Make $phpbb_container a global initiated by the framework
[ticket/11832] Fix log tests
[ticket/11832] update_web_root_path helper and tests
[ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)
Diffstat (limited to 'tests/template/template_events_test.php')
| -rw-r--r-- | tests/template/template_events_test.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/template/template_events_test.php b/tests/template/template_events_test.php index 4280a7e7ff..58691a36da 100644 --- a/tests/template/template_events_test.php +++ b/tests/template/template_events_test.php @@ -116,7 +116,14 @@ Zeta test event in all', $this->extension_manager = new phpbb_mock_filesystem_extension_manager( dirname(__FILE__) . "/datasets/$dataset/" ); - $this->template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context, $this->extension_manager); + $phpbb_filesystem = new phpbb_filesystem( + new phpbb_symfony_request( + new phpbb_mock_request() + ), + $phpbb_root_path, + $phpEx + ); + $this->template = new phpbb_template_twig($phpbb_filesystem, $config, $user, new phpbb_template_context, $this->extension_manager); $this->template->set_custom_style(((!empty($style_names)) ? $style_names : 'silver'), array($this->template_path)); } } |