mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-28 10:09:15 +02:00
Merge PR #778 branch 'cyberalien/ticket/10800' into develop
* cyberalien/ticket/10800: [ticket/10800] Changing html to js for includejs tests [ticket/10800] Changing template paths in tests
This commit is contained in:
commit
d8946e74de
1
tests/template/parent_templates/parent_and_child.js
Normal file
1
tests/template/parent_templates/parent_and_child.js
Normal file
@ -0,0 +1 @@
|
||||
// JavaScript file in a parent style.
|
1
tests/template/parent_templates/parent_only.js
Normal file
1
tests/template/parent_templates/parent_only.js
Normal file
@ -0,0 +1 @@
|
||||
// JavaScript file only in parent style.
|
@ -17,15 +17,14 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes
|
||||
$this->setup_engine(array('assets_version' => 1));
|
||||
|
||||
// Prepare correct result
|
||||
$dir = dirname(__FILE__);
|
||||
$scripts = array(
|
||||
'<script src="' . $dir . '/templates/parent_and_child.html?assets_version=1"></script>',
|
||||
'<script src="' . $dir . '/parent_templates/parent_only.html?assets_version=1"></script>',
|
||||
'<script src="' . $dir . '/templates/child_only.html?assets_version=1"></script>'
|
||||
'<script src="' . $this->test_path . '/templates/parent_and_child.js?assets_version=1"></script>',
|
||||
'<script src="' . $this->test_path . '/parent_templates/parent_only.js?assets_version=1"></script>',
|
||||
'<script src="' . $this->test_path . '/templates/child_only.js?assets_version=1"></script>'
|
||||
);
|
||||
|
||||
// Run test
|
||||
$cache_file = $this->template->cachepath . 'includejs.html.php';
|
||||
$this->run_template('includejs.html', array('PARENT' => 'parent_only.html'), array(), array(), implode('', $scripts), $cache_file);
|
||||
$this->run_template('includejs.html', array('PARENT' => 'parent_only.js'), array(), array(), implode('', $scripts), $cache_file);
|
||||
}
|
||||
}
|
||||
|
@ -17,21 +17,21 @@ class phpbb_template_template_locate_test extends phpbb_template_template_test_c
|
||||
// First element of the array is test name - keep them distinct
|
||||
array(
|
||||
'simple inheritance - only parent template exists',
|
||||
dirname(__FILE__) . '/parent_templates/parent_only.html',
|
||||
$this->test_path . '/parent_templates/parent_only.html',
|
||||
'parent_only.html',
|
||||
false,
|
||||
true,
|
||||
),
|
||||
array(
|
||||
'simple inheritance - only child template exists',
|
||||
dirname(__FILE__) . '/templates/child_only.html',
|
||||
$this->test_path . '/templates/child_only.html',
|
||||
'child_only.html',
|
||||
false,
|
||||
true,
|
||||
),
|
||||
array(
|
||||
'simple inheritance - both parent and child templates exist',
|
||||
dirname(__FILE__) . '/templates/parent_and_child.html',
|
||||
$this->test_path . '/templates/parent_and_child.html',
|
||||
'parent_and_child.html',
|
||||
false,
|
||||
true,
|
||||
|
@ -277,7 +277,7 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
|
||||
$this->template->set_filenames(array('test' => $filename));
|
||||
$this->assertFileNotExists($this->template_path . '/' . $filename, 'Testing missing file, file cannot exist');
|
||||
|
||||
$expecting = sprintf('style resource locator: File for handle test does not exist. Could not find: %s', realpath($this->template_path . '/../') . '/templates/' . $filename);
|
||||
$expecting = sprintf('style resource locator: File for handle test does not exist. Could not find: %s', $this->test_path . '/templates/' . $filename);
|
||||
$this->setExpectedTriggerError(E_USER_ERROR, $expecting);
|
||||
|
||||
$this->display('test');
|
||||
|
@ -18,6 +18,8 @@ class phpbb_template_template_test_case extends phpbb_test_case
|
||||
protected $style_resource_locator;
|
||||
protected $style_provider;
|
||||
|
||||
protected $test_path = 'tests/template';
|
||||
|
||||
// Keep the contents of the cache for debugging?
|
||||
const PRESERVE_CACHE = true;
|
||||
|
||||
@ -63,7 +65,7 @@ class phpbb_template_template_test_case extends phpbb_test_case
|
||||
$defaults = $this->config_defaults();
|
||||
$config = new phpbb_config(array_merge($defaults, $new_config));
|
||||
|
||||
$this->template_path = dirname(__FILE__) . '/templates';
|
||||
$this->template_path = $this->test_path . '/templates';
|
||||
$this->style_resource_locator = new phpbb_style_resource_locator();
|
||||
$this->style_provider = new phpbb_style_path_provider();
|
||||
$this->template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator);
|
||||
|
@ -18,8 +18,8 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat
|
||||
$defaults = $this->config_defaults();
|
||||
$config = new phpbb_config(array_merge($defaults, $new_config));
|
||||
|
||||
$this->template_path = dirname(__FILE__) . '/templates';
|
||||
$this->parent_template_path = dirname(__FILE__) . '/parent_templates';
|
||||
$this->template_path = $this->test_path . '/templates';
|
||||
$this->parent_template_path = $this->test_path . '/parent_templates';
|
||||
$this->style_resource_locator = new phpbb_style_resource_locator();
|
||||
$this->style_provider = new phpbb_style_path_provider();
|
||||
$this->template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator);
|
||||
|
1
tests/template/templates/child_only.js
Normal file
1
tests/template/templates/child_only.js
Normal file
@ -0,0 +1 @@
|
||||
// JavaScript file only in a child style.
|
@ -1,5 +1,5 @@
|
||||
<!-- INCLUDEJS parent_and_child.html -->
|
||||
<!-- INCLUDEJS parent_and_child.js -->
|
||||
<!-- INCLUDEJS {PARENT} -->
|
||||
<!-- DEFINE $TEST = 'child_only.html' -->
|
||||
<!-- DEFINE $TEST = 'child_only.js' -->
|
||||
<!-- INCLUDEJS {$TEST} -->
|
||||
{SCRIPTS}
|
1
tests/template/templates/parent_and_child.js
Normal file
1
tests/template/templates/parent_and_child.js
Normal file
@ -0,0 +1 @@
|
||||
// JavaScript file in a child style.
|
Loading…
x
Reference in New Issue
Block a user