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/extension | |
| 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/extension')
| -rw-r--r-- | tests/extension/finder_test.php | 8 | ||||
| -rw-r--r-- | tests/extension/metadata_manager_test.php | 5 | ||||
| -rw-r--r-- | tests/extension/phpbb/default/implementation.php (renamed from tests/extension/includes/default/implementation.php) | 0 |
3 files changed, 5 insertions, 8 deletions
diff --git a/tests/extension/finder_test.php b/tests/extension/finder_test.php index 6f3cebbd7c..3bf2c42573 100644 --- a/tests/extension/finder_test.php +++ b/tests/extension/finder_test.php @@ -36,7 +36,7 @@ class phpbb_extension_finder_test extends phpbb_test_case public function test_suffix_get_classes() { $classes = $this->finder - ->core_path('includes/default/') + ->core_path('phpbb/default/') ->extension_suffix('_class') ->get_classes(); @@ -81,7 +81,7 @@ class phpbb_extension_finder_test extends phpbb_test_case public function test_prefix_get_classes() { $classes = $this->finder - ->core_path('includes/default/') + ->core_path('phpbb/default/') ->extension_prefix('hidden_') ->get_classes(); @@ -98,7 +98,7 @@ class phpbb_extension_finder_test extends phpbb_test_case public function test_directory_get_classes() { $classes = $this->finder - ->core_path('includes/default/') + ->core_path('phpbb/default/') ->extension_directory('type') ->get_classes(); @@ -209,7 +209,7 @@ class phpbb_extension_finder_test extends phpbb_test_case public function test_cached_get_files() { $query = array( - 'core_path' => 'includes/foo', + 'core_path' => 'phpbb/foo', 'core_suffix' => false, 'core_prefix' => false, 'core_directory' => 'bar', diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php index d410333f09..e5bd29092e 100644 --- a/tests/extension/metadata_manager_test.php +++ b/tests/extension/metadata_manager_test.php @@ -7,8 +7,6 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/db/db_tools.php'; - class phpbb_extension_metadata_manager_test extends phpbb_database_test_case { protected $class_loader; @@ -42,12 +40,11 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case $this->user = new phpbb_user(); $this->table_prefix = 'phpbb_'; - $this->template = new phpbb_template( + $this->template = new phpbb_template_twig( $this->phpbb_root_path, $this->phpEx, $this->config, $this->user, - new phpbb_style_resource_locator(), new phpbb_template_context() ); diff --git a/tests/extension/includes/default/implementation.php b/tests/extension/phpbb/default/implementation.php index 91d5f8aa2f..91d5f8aa2f 100644 --- a/tests/extension/includes/default/implementation.php +++ b/tests/extension/phpbb/default/implementation.php |