From 4fb9f2101de8de8dc08ef0a1c44f81c5443f3d7a Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 14 Oct 2011 01:30:50 +0200
Subject: [feature/extension-manager] Support extensions in subdirectories of
 ext/

PHPBB3-10323
---
 tests/extension/manager_test.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'tests/extension/manager_test.php')

diff --git a/tests/extension/manager_test.php b/tests/extension/manager_test.php
index 4c49366d20..ba7f227a56 100644
--- a/tests/extension/manager_test.php
+++ b/tests/extension/manager_test.php
@@ -9,7 +9,7 @@
 
 require_once dirname(__FILE__) . '/../mock/cache.php';
 require_once dirname(__FILE__) . '/ext/bar/ext.php';
-require_once dirname(__FILE__) . '/ext/moo/ext.php';
+require_once dirname(__FILE__) . '/ext/vendor/moo/ext.php';
 
 class phpbb_extension_manager_test extends phpbb_database_test_case
 {
@@ -36,7 +36,7 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
 
 	public function test_available()
 	{
-		$this->assertEquals(array('bar', 'foo', 'moo'), array_keys($this->extension_manager->all_available()));
+		$this->assertEquals(array('bar', 'foo', 'vendor/moo'), array_keys($this->extension_manager->all_available()));
 	}
 
 	public function test_enabled()
@@ -46,7 +46,7 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
 
 	public function test_configured()
 	{
-		$this->assertEquals(array('foo', 'moo'), array_keys($this->extension_manager->all_configured()));
+		$this->assertEquals(array('foo', 'vendor/moo'), array_keys($this->extension_manager->all_configured()));
 	}
 
 	public function test_enable()
@@ -56,7 +56,7 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
 		$this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled()));
 		$this->extension_manager->enable('bar');
 		$this->assertEquals(array('bar', 'foo'), array_keys($this->extension_manager->all_enabled()));
-		$this->assertEquals(array('bar', 'foo', 'moo'), array_keys($this->extension_manager->all_configured()));
+		$this->assertEquals(array('bar', 'foo', 'vendor/moo'), array_keys($this->extension_manager->all_configured()));
 
 		$this->assertEquals(4, phpbb_ext_bar_ext::$state);
 	}
@@ -66,20 +66,20 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
 		$this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled()));
 		$this->extension_manager->disable('foo');
 		$this->assertEquals(array(), array_keys($this->extension_manager->all_enabled()));
-		$this->assertEquals(array('foo', 'moo'), array_keys($this->extension_manager->all_configured()));
+		$this->assertEquals(array('foo', 'vendor/moo'), array_keys($this->extension_manager->all_configured()));
 	}
 
 	public function test_purge()
 	{
-		phpbb_ext_moo_ext::$purged = false;
+		phpbb_ext_vendor_moo_ext::$purged = false;
 
 		$this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled()));
-		$this->assertEquals(array('foo', 'moo'), array_keys($this->extension_manager->all_configured()));
-		$this->extension_manager->purge('moo');
+		$this->assertEquals(array('foo', 'vendor/moo'), array_keys($this->extension_manager->all_configured()));
+		$this->extension_manager->purge('vendor/moo');
 		$this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled()));
 		$this->assertEquals(array('foo'), array_keys($this->extension_manager->all_configured()));
 
-		$this->assertTrue(phpbb_ext_moo_ext::$purged);
+		$this->assertTrue(phpbb_ext_vendor_moo_ext::$purged);
 	}
 
 	public function test_enabled_no_cache()
-- 
cgit v1.2.1