diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2014-07-08 18:09:41 +0200 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2014-07-08 18:09:41 +0200 |
commit | 91f5d59f69f6257eed1bb86f43c35d614aa06533 (patch) | |
tree | a4d0dcac0d35e8b6ea221bf372fd371b00ae3758 /tests/template | |
parent | dca8afcd6f7f867f729d0a2e55d4ae0d9a2961a3 (diff) | |
parent | b4d7192b62c98b0738711a7b7647a47129adb902 (diff) | |
download | forums-91f5d59f69f6257eed1bb86f43c35d614aa06533.tar forums-91f5d59f69f6257eed1bb86f43c35d614aa06533.tar.gz forums-91f5d59f69f6257eed1bb86f43c35d614aa06533.tar.bz2 forums-91f5d59f69f6257eed1bb86f43c35d614aa06533.tar.xz forums-91f5d59f69f6257eed1bb86f43c35d614aa06533.zip |
Merge pull request #2676 from Nicofuma/ticket/12787
[ticket/12787] Allow the route to say that the referer has to be used.
* Nicofuma/ticket/12787:
[ticket/12787] Updates phpbb_mock_controller_helper
[ticket/12787] Add controller_helper::get_current_url()
[ticket/12787] Remove one app.php when it's both in $path and $web_root_path
[ticket/12787] Fix the absolute board url
[ticket/12787] Use a parameter (_referer) instead of the Referer header
[ticket/12099] Add unit tests for get_web_root_path_from_ajax_referer()
[ticket/12099] Remove config again
[ticket/12099] Correctly fix the path when performing AJAX requests
[ticket/12099] Add request argument to path_helper service
Diffstat (limited to 'tests/template')
-rw-r--r-- | tests/template/template_events_test.php | 1 | ||||
-rw-r--r-- | tests/template/template_test_case.php | 1 | ||||
-rw-r--r-- | tests/template/template_test_case_with_tree.php | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/tests/template/template_events_test.php b/tests/template/template_events_test.php index ce3c90b78a..c415c969fe 100644 --- a/tests/template/template_events_test.php +++ b/tests/template/template_events_test.php @@ -143,6 +143,7 @@ Zeta test event in all', new phpbb_mock_request() ), new \phpbb\filesystem(), + $this->getMock('\phpbb\request\request'), $phpbb_root_path, $phpEx ); diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php index 00b823b2c4..83446b5352 100644 --- a/tests/template/template_test_case.php +++ b/tests/template/template_test_case.php @@ -72,6 +72,7 @@ class phpbb_template_template_test_case extends phpbb_test_case new phpbb_mock_request() ), new \phpbb\filesystem(), + $this->getMock('\phpbb\request\request'), $phpbb_root_path, $phpEx ); diff --git a/tests/template/template_test_case_with_tree.php b/tests/template/template_test_case_with_tree.php index 4f778a9c1c..68ecc4b706 100644 --- a/tests/template/template_test_case_with_tree.php +++ b/tests/template/template_test_case_with_tree.php @@ -27,6 +27,7 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat new phpbb_mock_request() ), new \phpbb\filesystem(), + $this->getMock('\phpbb\request\request'), $phpbb_root_path, $phpEx ); |