aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2010-03-28 14:12:36 +0200
committerIgor Wiedler <igor@wiedler.ch>2010-03-28 14:12:36 +0200
commit472739bcbc8f439370a76629e1d8f83398648e43 (patch)
tree7b238443f097fddddef2e20b8419f7392bab3214 /tests
parentMerge branch 'develop-olympus' into git-tools (diff)
parentMerge remote branch 'github-nickvergessen/develop-olympus' into develop-olympus (diff)
downloadphpbb-472739bcbc8f439370a76629e1d8f83398648e43.tar.gz
phpbb-472739bcbc8f439370a76629e1d8f83398648e43.tar.bz2
phpbb-472739bcbc8f439370a76629e1d8f83398648e43.zip
Merge branch 'develop-olympus' into git-tools
Diffstat (limited to 'tests')
-rw-r--r--tests/template/template.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/template/template.php b/tests/template/template.php
index df12f92046..145fe8de61 100644
--- a/tests/template/template.php
+++ b/tests/template/template.php
@@ -264,7 +264,7 @@ class phpbb_template_template_test extends phpbb_test_case
$this->template->set_filenames(array('test' => $filename));
$this->assertFileNotExists($this->template_path . '/' . $filename, 'Testing missing file, file cannot exist');
- $expecting = sprintf('template->_tpl_load_file(): File %s does not exist or is empty', realpath($this->template_path) . '/' . $filename);
+ $expecting = sprintf('template->_tpl_load_file(): File %s does not exist or is empty', realpath($this->template_path . '/../') . '/templates/' . $filename);
$this->setExpectedTriggerError(E_USER_ERROR, $expecting);
$this->display('test');