diff options
author | Nils Adermann <naderman@naderman.de> | 2013-07-11 13:41:39 -0700 |
---|---|---|
committer | Nils Adermann <naderman@naderman.de> | 2013-07-11 13:41:39 -0700 |
commit | bdd1d4d132ce3e1491c8b8509c3b5958887ed1de (patch) | |
tree | f3cc5a423818f4d2706ec69fcbd9ed219bfedb27 /tests | |
parent | 59f34bef087259722e1f7eaa95b96460e007cb30 (diff) | |
parent | 9f5c1e0062c8312a3fd3384e063e741f383b3675 (diff) | |
download | forums-bdd1d4d132ce3e1491c8b8509c3b5958887ed1de.tar forums-bdd1d4d132ce3e1491c8b8509c3b5958887ed1de.tar.gz forums-bdd1d4d132ce3e1491c8b8509c3b5958887ed1de.tar.bz2 forums-bdd1d4d132ce3e1491c8b8509c3b5958887ed1de.tar.xz forums-bdd1d4d132ce3e1491c8b8509c3b5958887ed1de.zip |
Merge pull request #1509 from EXreaction/ticket/11388
Ticket/11388 INCLUDECSS
Diffstat (limited to 'tests')
-rw-r--r-- | tests/template/parent_templates/parent_only.css | 0 | ||||
-rw-r--r-- | tests/template/template_includecss_test.php | 28 | ||||
-rw-r--r-- | tests/template/templates/child_only.css | 0 | ||||
-rw-r--r-- | tests/template/templates/includecss.html | 3 | ||||
-rw-r--r-- | tests/template/templates/twig_parent.html | 2 |
5 files changed, 32 insertions, 1 deletions
diff --git a/tests/template/parent_templates/parent_only.css b/tests/template/parent_templates/parent_only.css new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/template/parent_templates/parent_only.css diff --git a/tests/template/template_includecss_test.php b/tests/template/template_includecss_test.php new file mode 100644 index 0000000000..f8999ad1a9 --- /dev/null +++ b/tests/template/template_includecss_test.php @@ -0,0 +1,28 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/template_test_case_with_tree.php'; + +class phpbb_template_template_includecss_test extends phpbb_template_template_test_case_with_tree +{ + public function test_includecss_compilation() + { + // Reset the engine state + $this->setup_engine(array('assets_version' => 1)); + + // Prepare correct result + $scripts = array( + '<link href="' . $this->test_path . '/templates/child_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen, projection" />', + '<link href="' . $this->test_path . '/parent_templates/parent_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen, projection" />', + ); + + // Run test + $this->run_template('includecss.html', array(), array(), array(), implode('', $scripts)); + } +} diff --git a/tests/template/templates/child_only.css b/tests/template/templates/child_only.css new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/template/templates/child_only.css diff --git a/tests/template/templates/includecss.html b/tests/template/templates/includecss.html new file mode 100644 index 0000000000..a09e44f240 --- /dev/null +++ b/tests/template/templates/includecss.html @@ -0,0 +1,3 @@ +<!-- INCLUDECSS child_only.css --> +<!-- INCLUDECSS parent_only.css --> +{$STYLESHEETS} diff --git a/tests/template/templates/twig_parent.html b/tests/template/templates/twig_parent.html index af528e0da4..e9863221e1 100644 --- a/tests/template/templates/twig_parent.html +++ b/tests/template/templates/twig_parent.html @@ -4,4 +4,4 @@ <!-- BLOCK overwritten --> 2 -<!-- ENDBLOCK -->
\ No newline at end of file +<!-- ENDBLOCK --> |