diff options
| author |   Nils Adermann <naderman@naderman.de> | 2010-03-26 18:27:39 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-26 18:27:39 +0100 |
| commit | d79cff235c761d10c148eb1434ce72289f4327a0 (patch) | |
| tree | 6823711e34a3d6ea8be6f8b967276ff978cbf7be /tests | |
| parent | Merge branch 'bug/jellydoughnut/56965' into develop-olympus (diff) | |
| parent | [develop-olympus] Make this test run on windows with backslash-paths. (diff) | |
| download | phpbb-d79cff235c761d10c148eb1434ce72289f4327a0.tar.gz phpbb-d79cff235c761d10c148eb1434ce72289f4327a0.tar.bz2 phpbb-d79cff235c761d10c148eb1434ce72289f4327a0.zip | |
Merge remote branch 'github-nickvergessen/develop-olympus' into develop-olympus
* github-nickvergessen/develop-olympus:
[develop-olympus] Make this test run on windows with backslash-paths.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/template/template.php | 2 |
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'); |