aboutsummaryrefslogtreecommitdiffstats
path: root/tests/template
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2015-05-14 23:17:29 +0200
committerAndreas Fischer <bantu@phpbb.com>2015-05-14 23:17:29 +0200
commit10e625d30a60b8e59f0739aad71f8a1393dbcad6 (patch)
treed6747583ddd6015182195a4d9e5cc3ad24d1e0fe /tests/template
parent0b8632e7504a2ea46cdcc7493f15043b056f4af2 (diff)
parent737affcbb2f2e4f7ee5d8182a4e8cac599265ef4 (diff)
downloadforums-10e625d30a60b8e59f0739aad71f8a1393dbcad6.tar
forums-10e625d30a60b8e59f0739aad71f8a1393dbcad6.tar.gz
forums-10e625d30a60b8e59f0739aad71f8a1393dbcad6.tar.bz2
forums-10e625d30a60b8e59f0739aad71f8a1393dbcad6.tar.xz
forums-10e625d30a60b8e59f0739aad71f8a1393dbcad6.zip
Merge pull request #3609 from Nicofuma/ticket/13839
[ticket/13839] Don't be dependent on the phpBB root directory name in tests * Nicofuma/ticket/13839: [ticket/13839] Don't be dependent on the phpBB root directory name in tests
Diffstat (limited to 'tests/template')
-rw-r--r--tests/template/asset_test.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/template/asset_test.php b/tests/template/asset_test.php
index f6ce0fe241..3d2fdd8959 100644
--- a/tests/template/asset_test.php
+++ b/tests/template/asset_test.php
@@ -22,7 +22,7 @@ class phpbb_template_asset_test extends phpbb_test_case
array('.', 'foo/bar', 'foo/bar'),
array('../', 'foo/bar', 'foo/bar'),
array('./phpBB/', 'foo/bar', 'foo/bar'),
- array('../', __DIR__ . '/foo/bar', '../phpbb/tests/template/foo/bar'),
+ array('../', __DIR__ . '/foo/bar', '../' . basename(dirname(dirname(__DIR__))) . '/tests/template/foo/bar'),
array('./', __DIR__ . '/foo/bar', './tests/template/foo/bar'),
array('./phpBB/', __DIR__ . '/foo/bar', 'tests/template/foo/bar'),
);