1 files changed, 21 insertions, 53 deletions
diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php
index 1b406e5042..8614c0c963 100644
--- a/tests/functional/extension_acp_test.php
+++ b/tests/functional/extension_acp_test.php
@@ -12,34 +12,25 @@
 */
 class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
 {
-	static private $copied_files = array();
 	static private $helper;
 
-	/**
-	* This should only be called once before the tests are run.
-	* This is used to copy the extensions to the phpBB install
-	*/
+	static protected $fixtures = array(
+		'./',
+	);
+
 	static public function setUpBeforeClass()
 	{
-		global $phpbb_root_path;
-
 		parent::setUpBeforeClass();
 
 		self::$helper = new phpbb_test_case_helpers(self);
+		self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/../extension/ext/', self::$fixtures);
+	}
 
-		self::$copied_files = array();
-
-		if (file_exists($phpbb_root_path . 'ext/'))
-		{
-			// First, move any extensions setup on the board to a temp directory
-			self::$copied_files = self::$helper->copy_dir($phpbb_root_path . 'ext/', $phpbb_root_path . 'store/temp_ext/');
-
-			// Then empty the ext/ directory on the board (for accurate test cases)
-			self::$helper->empty_dir($phpbb_root_path . 'ext/');
-		}
+	static public function tearDownAfterClass()
+	{
+		parent::tearDownAfterClass();
 
-		// Copy our ext/ files from the test case to the board
-		self::$copied_files = array_merge(self::$copied_files, self::$helper->copy_dir(dirname(__FILE__) . '/../extension/ext/', $phpbb_root_path . 'ext/'));
+		self::$helper->restore_original_ext_dir();
 	}
 
 	public function setUp()
@@ -84,32 +75,9 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
 		$this->add_lang('acp/extensions');
 	}
 
-	/**
-	* This should only be called once after the tests are run.
-	* This is used to remove the files copied to the phpBB install
-	*/
-	static public function tearDownAfterClass()
-	{
-		global $phpbb_root_path;
-
-		if (file_exists($phpbb_root_path . 'store/temp_ext/'))
-		{
-			// Copy back the board installed extensions from the temp directory
-			self::$helper->copy_dir($phpbb_root_path . 'store/temp_ext/', $phpbb_root_path . 'ext/');
-		}
-
-		// Remove all of the files we copied around (from board ext -> temp_ext, from test ext -> board ext)
-		self::$helper->remove_files(self::$copied_files);
-
-		if (file_exists($phpbb_root_path . 'store/temp_ext/'))
-		{
-			self::$helper->empty_dir($phpbb_root_path . 'store/temp_ext/');
-		}
-	}
-
 	public function test_list()
 	{
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid);
+        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid);
 
         $this->assertCount(1, $crawler->filter('.ext_enabled'));
         $this->assertCount(5, $crawler->filter('.ext_disabled'));
@@ -131,7 +99,7 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
 
 	public function test_details()
 	{
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=details&ext_name=foo&sid=' . $this->sid);
+        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=details&ext_name=foo&sid=' . $this->sid);
 
         $validation = array(
         	'DISPLAY_NAME'		=> 'phpBB Foo Extension',
@@ -174,46 +142,46 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
 	public function test_enable_pre()
 	{
 		// Foo is already enabled (redirect to list)
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=foo&sid=' . $this->sid);
+        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=foo&sid=' . $this->sid);
         $this->assertContainsLang('EXTENSION_NAME', $crawler->filter('html')->text());
         $this->assertContainsLang('EXTENSION_OPTIONS', $crawler->filter('html')->text());
         $this->assertContainsLang('EXTENSION_ACTIONS', $crawler->filter('html')->text());
 
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=vendor%2Fmoo&sid=' . $this->sid);
+        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=vendor%2Fmoo&sid=' . $this->sid);
         $this->assertContainsLang('ENABLE_CONFIRM', $crawler->filter('html')->text());
 	}
 
 	public function test_disable_pre()
 	{
         // Moo is not enabled (redirect to list)
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable_pre&ext_name=vendor%2Fmoo&sid=' . $this->sid);
+        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable_pre&ext_name=vendor%2Fmoo&sid=' . $this->sid);
         $this->assertContainsLang('EXTENSION_NAME', $crawler->filter('html')->text());
         $this->assertContainsLang('EXTENSION_OPTIONS', $crawler->filter('html')->text());
         $this->assertContainsLang('EXTENSION_ACTIONS', $crawler->filter('html')->text());
 
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable_pre&ext_name=foo&sid=' . $this->sid);
+        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable_pre&ext_name=foo&sid=' . $this->sid);
         $this->assertContainsLang('DISABLE_CONFIRM', $crawler->filter('html')->text());
 	}
 
 	public function test_purge_pre()
 	{
         // test2 is not available (error)
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=purge_pre&ext_name=test2&sid=' . $this->sid);
+        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=purge_pre&ext_name=test2&sid=' . $this->sid);
         $this->assertContains('The required file does not exist', $crawler->filter('html')->text());
 
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=purge_pre&ext_name=foo&sid=' . $this->sid);
+        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=purge_pre&ext_name=foo&sid=' . $this->sid);
         $this->assertContainsLang('PURGE_CONFIRM', $crawler->filter('html')->text());
 	}
 
 	public function test_actions()
 	{
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable&ext_name=vendor%2Fmoo&sid=' . $this->sid);
+        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable&ext_name=vendor%2Fmoo&sid=' . $this->sid);
         $this->assertContainsLang('ENABLE_SUCCESS', $crawler->filter('html')->text());
 
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable&ext_name=vendor%2Fmoo&sid=' . $this->sid);
+        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable&ext_name=vendor%2Fmoo&sid=' . $this->sid);
         $this->assertContainsLang('DISABLE_SUCCESS', $crawler->filter('html')->text());
 
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=purge&ext_name=vendor%2Fmoo&sid=' . $this->sid);
+        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=purge&ext_name=vendor%2Fmoo&sid=' . $this->sid);
         $this->assertContainsLang('PURGE_SUCCESS', $crawler->filter('html')->text());
 	}
 }
 \ No newline at end of file