diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-07-14 16:51:46 -0400 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-07-14 16:51:46 -0400 |
| commit | bc6122b64ffb5c13c26991f78346fdc7dee6f9f0 (patch) | |
| tree | 31673423cd6ab751bc8b102c97e89a182a94e219 /tests/class_loader/class_loader_test.php | |
| parent | 79dd44061bbfeab64dd2ff7b40541612c219c33c (diff) | |
| parent | 1891e24ea6f5b8d5944535479182e70119b2979f (diff) | |
| download | forums-bc6122b64ffb5c13c26991f78346fdc7dee6f9f0.tar forums-bc6122b64ffb5c13c26991f78346fdc7dee6f9f0.tar.gz forums-bc6122b64ffb5c13c26991f78346fdc7dee6f9f0.tar.bz2 forums-bc6122b64ffb5c13c26991f78346fdc7dee6f9f0.tar.xz forums-bc6122b64ffb5c13c26991f78346fdc7dee6f9f0.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11531
Diffstat (limited to 'tests/class_loader/class_loader_test.php')
| -rw-r--r-- | tests/class_loader/class_loader_test.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/class_loader/class_loader_test.php b/tests/class_loader/class_loader_test.php index bf27c7c217..2b55c1ff8d 100644 --- a/tests/class_loader/class_loader_test.php +++ b/tests/class_loader/class_loader_test.php @@ -30,9 +30,9 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase public function test_resolve_path() { $prefix = dirname(__FILE__) . '/'; - $class_loader = new phpbb_class_loader('phpbb_', $prefix . 'includes/'); + $class_loader = new phpbb_class_loader('phpbb_', $prefix . 'phpbb/'); - $prefix .= 'includes/'; + $prefix .= 'phpbb/'; $this->assertEquals( '', @@ -71,10 +71,10 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase $cache = new phpbb_mock_cache($cache_map); $prefix = dirname(__FILE__) . '/'; - $class_loader = new phpbb_class_loader('phpbb_', $prefix . 'includes/', 'php', $cache); - $class_loader_ext = new phpbb_class_loader('phpbb_ext_', $prefix . 'includes/', 'php', $cache); + $class_loader = new phpbb_class_loader('phpbb_', $prefix . 'phpbb/', 'php', $cache); + $class_loader_ext = new phpbb_class_loader('phpbb_ext_', $prefix . 'phpbb/', 'php', $cache); - $prefix .= 'includes/'; + $prefix .= 'phpbb/'; $this->assertEquals( $prefix . 'dir/class_name.php', |