aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-04-14 12:40:47 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-04-14 12:40:47 +0200
commitb487da7c053a129c8e06056e4659ba7928f63c40 (patch)
treee5a851e00fb9a1c971a42a0d9ee6ed4674a2c131 /tests
parentaebf2cc5cd5b76b3cc42b819dc446afb7cdbbad3 (diff)
parent5dc3651290b0d6cad28534e6f88cc166f2e0a5b8 (diff)
downloadforums-b487da7c053a129c8e06056e4659ba7928f63c40.tar
forums-b487da7c053a129c8e06056e4659ba7928f63c40.tar.gz
forums-b487da7c053a129c8e06056e4659ba7928f63c40.tar.bz2
forums-b487da7c053a129c8e06056e4659ba7928f63c40.tar.xz
forums-b487da7c053a129c8e06056e4659ba7928f63c40.zip
Merge remote-tracking branch 'marc/ticket/12004' into develop-ascraeus
* marc/ticket/12004: [ticket/12004] Support empty routes to app.php/ in path_helper
Diffstat (limited to 'tests')
-rw-r--r--tests/path_helper/web_root_path_test.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/path_helper/web_root_path_test.php b/tests/path_helper/web_root_path_test.php
index 2c22511402..ec04135997 100644
--- a/tests/path_helper/web_root_path_test.php
+++ b/tests/path_helper/web_root_path_test.php
@@ -116,6 +116,13 @@ class phpbb_path_helper_web_root_path_test extends phpbb_test_case
'/phpbb3-fork/phpBB/foo/template',
'/phpbb3-fork/phpBB/app.php',
),
+ array(
+ $this->phpbb_root_path . 'test.php',
+ $this->phpbb_root_path . '../test.php',
+ '/',
+ '/phpbb3-fork/phpBB/app.php/',
+ '/phpbb3-fork/phpBB/app.php',
+ ),
);
}