diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-02-11 13:03:22 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-02-11 13:03:22 +0100 |
| commit | 25b54791f9cc64f3e861a169a8a70d69c0cc2131 (patch) | |
| tree | 6bbc74f8b6c1240f176e70575eab17926cfedd0e /tests/controller/common_helper_route.php | |
| parent | c6a371531bab7ba7f003c57d25b6b515718eb54f (diff) | |
| download | forums-25b54791f9cc64f3e861a169a8a70d69c0cc2131.tar forums-25b54791f9cc64f3e861a169a8a70d69c0cc2131.tar.gz forums-25b54791f9cc64f3e861a169a8a70d69c0cc2131.tar.bz2 forums-25b54791f9cc64f3e861a169a8a70d69c0cc2131.tar.xz forums-25b54791f9cc64f3e861a169a8a70d69c0cc2131.zip | |
[ticket/13493] Append page name to base url if it doesn't contain it
PHPBB3-13493
Diffstat (limited to 'tests/controller/common_helper_route.php')
| -rw-r--r-- | tests/controller/common_helper_route.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/controller/common_helper_route.php b/tests/controller/common_helper_route.php index 6723e3bc52..ff1af8119b 100644 --- a/tests/controller/common_helper_route.php +++ b/tests/controller/common_helper_route.php @@ -51,6 +51,11 @@ abstract class phpbb_controller_common_helper_route extends phpbb_test_case return '/app.php'; } + protected function get_base_uri() + { + return $this->get_uri(); + } + protected function get_script_name() { return 'app.php'; @@ -66,7 +71,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_test_case $this->request = new phpbb_mock_request(); $this->request->overwrite('SCRIPT_NAME', $this->get_uri(), \phpbb\request\request_interface::SERVER); $this->request->overwrite('SCRIPT_FILENAME', $this->get_script_name(), \phpbb\request\request_interface::SERVER); - $this->request->overwrite('REQUEST_URI', $this->get_uri(), \phpbb\request\request_interface::SERVER); + $this->request->overwrite('REQUEST_URI', $this->get_base_uri(), \phpbb\request\request_interface::SERVER); $this->request->overwrite('SERVER_NAME', 'localhost', \phpbb\request\request_interface::SERVER); $this->request->overwrite('SERVER_PORT', '80', \phpbb\request\request_interface::SERVER); |