aboutsummaryrefslogtreecommitdiffstats
path: root/tests/extension
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-08-15 21:38:47 -0400
committerNils Adermann <naderman@naderman.de>2011-09-29 15:42:46 +0200
commit96209e022477d97b581b79cabace4caddd19501b (patch)
tree660134bf3d3bc3a3ab50a222e789aafea5379b4a /tests/extension
parent989bd9cde7314024999f5b92fc2ff4572b9ac937 (diff)
downloadforums-96209e022477d97b581b79cabace4caddd19501b.tar
forums-96209e022477d97b581b79cabace4caddd19501b.tar.gz
forums-96209e022477d97b581b79cabace4caddd19501b.tar.bz2
forums-96209e022477d97b581b79cabace4caddd19501b.tar.xz
forums-96209e022477d97b581b79cabace4caddd19501b.zip
[feature/extension-manager] The class loader no longer knows about extensions
Instead the class loader is instantiated twice. Once with the phpbb_ prefix and once with the phpbb_ext_ prefix. PHPBB3-10323
Diffstat (limited to 'tests/extension')
-rw-r--r--tests/extension/manager_test.php17
1 files changed, 1 insertions, 16 deletions
diff --git a/tests/extension/manager_test.php b/tests/extension/manager_test.php
index ebd92a728d..2035264559 100644
--- a/tests/extension/manager_test.php
+++ b/tests/extension/manager_test.php
@@ -23,30 +23,15 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
{
parent::setUp();
- // disable the regular class loader to replace it with one that loads
- // test extensions
- global $class_loader;
- $class_loader->unregister();
-
- $prefix = dirname(__FILE__) . '/';
- $this->class_loader = new phpbb_class_loader($prefix . '../../phpBB/includes/', $prefix . 'ext/');
- $this->class_loader->register();
-
$this->extension_manager = new phpbb_extension_manager(
$this->new_dbal(),
'phpbb_ext',
- $prefix,
+ dirname(__FILE__) . '/',
'.php',
new phpbb_mock_cache
);
}
- protected function tearDown()
- {
- global $class_loader;
- $class_loader->register();
- }
-
public function test_available()
{
$this->assertEquals(array('bar', 'foo', 'moo'), array_keys($this->extension_manager->all_available()));