Merge pull request phpbb#1872 from nickvergessen/ticket/12017

Ticket/12017 Extension tests are broken on current develop
rlerdorf · Nov 14, 2013 · 8fd1f90 · 8fd1f90
2 parents 52845b2 + 1e73e0c
commit 8fd1f90
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 21 deletions.
diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
@@ -19,6 +19,8 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	static protected $fixtures = array(
 		'foo/bar/config/',
 		'foo/bar/controller/',
+		'foo/bar/event/',
+		'foo/bar/language/en/',
 		'foo/bar/styles/prosilver/template/',
 	);
 

diff --git a/tests/functional/extension_global_lang_test.php b/tests/functional/extension_global_lang_test.php
@@ -17,8 +17,9 @@ class phpbb_functional_extension_global_lang_test extends phpbb_functional_test_
 	static private $helper;
 
 	static protected $fixtures = array(
-		'foo/bar/language/en/',
+		'foo/bar/config/',
 		'foo/bar/event/',
+		'foo/bar/language/en/',
 	);
 
 	static public function setUpBeforeClass()

diff --git a/tests/functional/extension_permission_lang_test.php b/tests/functional/extension_permission_lang_test.php
@@ -17,8 +17,9 @@ class phpbb_functional_extension_permission_lang_test extends phpbb_functional_t
 	static private $helper;
 
 	static protected $fixtures = array(
-		'foo/bar/language/en/',
+		'foo/bar/config/',
 		'foo/bar/event/',
+		'foo/bar/language/en/',
 	);
 
 	static public function setUpBeforeClass()

diff --git a/tests/functional/fixtures/ext/foo/bar/composer.json b/tests/functional/fixtures/ext/foo/bar/composer.json
@@ -14,7 +14,7 @@
 	}],
 	"require": {
 		"php": ">=5.3",
-		"phpbb": "3.1.*@dev"
+		"phpbb/phpbb": "3.1.*@dev"
 	},
 	"extra": {
 		"display-name": "phpBB 3.1 Extension Testing"

diff --git a/tests/functional/fixtures/ext/foo/bar/event/permission.php b/tests/functional/fixtures/ext/foo/bar/event/permission.php
@@ -10,15 +10,6 @@
 
 namespace foo\bar\event;
 
-/**
-* @ignore
-*/
-
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 /**
 * Event listener
 */

diff --git a/tests/functional/fixtures/ext/foo/bar/event/user_setup.php b/tests/functional/fixtures/ext/foo/bar/event/user_setup.php
@@ -10,15 +10,6 @@
 
 namespace foo\bar\event;
 
-/**
-* @ignore
-*/
-
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 /**
 * Event listener
 */