mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-17 07:01:22 +02:00
Code Issues Releases Wiki Activity

[feature/template-events] Allow dataset to be correctly selectable.

Browse Source 
PHPBB3-9550
This commit is contained in:
Oleg Pudeyev
2012-11-08 20:17:44 -05:00
parent 99d93a3f0f
commit 0e6d12dfc4
2 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tests/mock/filesystem_extension_manager.php Normal file
View File

@@ -0,0 +1,31 @@
<?php
/**
*
* @package testing
* @copyright (c) 2012 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
class phpbb_mock_filesystem_extension_manager extends phpbb_mock_extension_manager
{
public function __construct($phpbb_root_path)
{
$extensions = array();
$iterator = new DirectoryIterator($phpbb_root_path . 'ext/');
foreach ($iterator as $fileinfo)
{
if ($fileinfo->isDir() && substr($fileinfo->getFilename(), 0, 1) != '.')
{
$name = $fileinfo->getFilename();
$extension = array(
'ext_name' => $name,
'ext_active' => true,
'ext_path' => 'ext/' . $name . '/',
);
$extensions[$name] = $extension;
}
}
parent::__construct($phpbb_root_path, $extensions);
}
}

22
tests/template/template_events_test.php
View File

@@ -17,6 +17,7 @@ class phpbb_template_template_events_test extends phpbb_template_template_test_c
/* /*
array( array(
'', // File '', // File
'', // Dataset
array(), // vars array(), // vars
array(), // block vars array(), // block vars
array(), // destroy array(), // destroy
@@ -25,6 +26,7 @@ class phpbb_template_template_events_test extends phpbb_template_template_test_c
*/ */
array( array(
'Simple template event', 'Simple template event',
'ext_trivial',
'event_simple.html', 'event_simple.html',
array(), array(),
array(), array(),
@@ -33,6 +35,7 @@ class phpbb_template_template_events_test extends phpbb_template_template_test_c
), ),
array( array(
'Universal template event ("all" style)', 'Universal template event ("all" style)',
'ext_trivial',
'event_universal.html', 'event_universal.html',
array(), array(),
array(), array(),
@@ -45,34 +48,27 @@ class phpbb_template_template_events_test extends phpbb_template_template_test_c
/** /**
* @dataProvider template_data * @dataProvider template_data
*/ */
public function test_event($desc, $file, array $vars, array $block_vars, array $destroy, $expected) public function test_event($desc, $dataset, $file, array $vars, array $block_vars, array $destroy, $expected)
{ {
// Reset the engine state // Reset the engine state
$this->setup_engine(); $this->setup_engine_with_dataset($dataset);
// Run test // Run test
$cache_file = $this->template->cachepath . str_replace('/', '.', $file) . '.php'; $cache_file = $this->template->cachepath . str_replace('/', '.', $file) . '.php';
$this->run_template($file, $vars, $block_vars, $destroy, $expected, $cache_file); $this->run_template($file, $vars, $block_vars, $destroy, $expected, $cache_file);
} }
protected function setup_engine(array $new_config = array()) protected function setup_engine_with_dataset($dataset, array $new_config = array())
{ {
global $phpbb_root_path, $phpEx, $user; global $phpbb_root_path, $phpEx, $user;
$defaults = $this->config_defaults(); $defaults = $this->config_defaults();
$config = new phpbb_config(array_merge($defaults, $new_config)); $config = new phpbb_config(array_merge($defaults, $new_config));
$this->template_path = dirname(__FILE__) . '/datasets/ext_trivial/templates'; $this->template_path = dirname(__FILE__) . "/datasets/$dataset/templates";
$this->style_resource_locator = new phpbb_style_resource_locator(); $this->style_resource_locator = new phpbb_style_resource_locator();
$this->extension_manager = new phpbb_mock_extension_manager( $this->extension_manager = new phpbb_mock_filesystem_extension_manager(
dirname(__FILE__) . '/datasets/ext_trivial/', dirname(__FILE__) . "/datasets/$dataset/"
array(
'trivial' => array(
'ext_name' => 'trivial',
'ext_active' => true,
'ext_path' => 'ext/trivial/',
),
)
); );
$this->template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, new phpbb_template_context, $this->extension_manager); $this->template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, new phpbb_template_context, $this->extension_manager);
$this->style_provider = new phpbb_style_path_provider(); $this->style_provider = new phpbb_style_path_provider();