core/modules/system/src/Tests/Theme/TwigRegistryLoaderTest.php | 4 ++++ .../templates/twig-registry-loader-test-extend-same-name.html.twig | 2 ++ .../twig_theme_test/templates/twig-registry-loader-test.html.twig | 1 + .../system/tests/modules/twig_theme_test/twig_theme_test.module | 3 +++ .../templates/twig-registry-loader-test-extend-same-name.html.twig | 2 ++ .../templates/twig-registry-loader-test-extend-same-name.html.twig | 2 ++ 6 files changed, 14 insertions(+) diff --git a/core/modules/system/src/Tests/Theme/TwigRegistryLoaderTest.php b/core/modules/system/src/Tests/Theme/TwigRegistryLoaderTest.php index 86cf7c9..05b7b30 100644 --- a/core/modules/system/src/Tests/Theme/TwigRegistryLoaderTest.php +++ b/core/modules/system/src/Tests/Theme/TwigRegistryLoaderTest.php @@ -46,6 +46,7 @@ public function testExtendsAndInclude() { $this->drupalGet('twig-theme-test/registry-loader'); $this->assertText('This line is from twig_theme_test/templates/twig-registry-loader-test-extend.html.twig'); $this->assertText('This line is from twig_theme_test/templates/twig-registry-loader-test-include.html.twig'); + $this->assertRaw(''); // Enable a theme that overrides the extend and insert templates to ensure // they are picked up by the registry node visitor. @@ -55,6 +56,7 @@ public function testExtendsAndInclude() { $this->drupalGet('twig-theme-test/registry-loader'); $this->assertText('This line is from test_theme_twig_registry_loader/templates/twig-registry-loader-test-extend.html.twig'); $this->assertText('This line is from test_theme_twig_registry_loader/templates/twig-registry-loader-test-include.html.twig'); + $this->assertRaw(''); // Enable overriding theme that overrides the extend and insert templates // from the base theme. @@ -64,6 +66,7 @@ public function testExtendsAndInclude() { $this->drupalGet('twig-theme-test/registry-loader'); $this->assertText('This line is from test_theme_twig_registry_loader_theme/templates/twig-registry-loader-test-extend.html.twig'); $this->assertText('This line is from test_theme_twig_registry_loader_theme/templates/twig-registry-loader-test-include.html.twig'); + $this->assertRaw(''); // Enable a subtheme for the theme that doesn't have any overrides to make // sure that templates are being loaded from the first parent which has the @@ -74,6 +77,7 @@ public function testExtendsAndInclude() { $this->drupalGet('twig-theme-test/registry-loader'); $this->assertText('This line is from test_theme_twig_registry_loader_theme/templates/twig-registry-loader-test-extend.html.twig'); $this->assertText('This line is from test_theme_twig_registry_loader_theme/templates/twig-registry-loader-test-include.html.twig'); + $this->assertRaw(''); } } diff --git a/core/modules/system/tests/modules/twig_theme_test/templates/twig-registry-loader-test-extend-same-name.html.twig b/core/modules/system/tests/modules/twig_theme_test/templates/twig-registry-loader-test-extend-same-name.html.twig new file mode 100644 index 0000000..8883d27 --- /dev/null +++ b/core/modules/system/tests/modules/twig_theme_test/templates/twig-registry-loader-test-extend-same-name.html.twig @@ -0,0 +1,2 @@ +{% set attributes = attributes.addClass('module') %} + diff --git a/core/modules/system/tests/modules/twig_theme_test/templates/twig-registry-loader-test.html.twig b/core/modules/system/tests/modules/twig_theme_test/templates/twig-registry-loader-test.html.twig index a3723b5..48c29a4 100644 --- a/core/modules/system/tests/modules/twig_theme_test/templates/twig-registry-loader-test.html.twig +++ b/core/modules/system/tests/modules/twig_theme_test/templates/twig-registry-loader-test.html.twig @@ -1,5 +1,6 @@ {% extends "twig-registry-loader-test-extend.html.twig" %} {% block content %} + {% include "twig-registry-loader-test-extend-same-name.html.twig" %} {% include "twig-registry-loader-test-include.html.twig" %} {% endblock %} diff --git a/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module b/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module index 550b5ca..5668efd 100644 --- a/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module +++ b/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module @@ -37,6 +37,9 @@ function twig_theme_test_theme($existing, $type, $theme, $path) { $items['twig_registry_loader_test_extend'] = array( 'variables' => array(), ); + $items['twig_registry_loader_test_extend_same_name'] = array( + 'variables' => array(), + ); $items['twig_raw_test'] = array( 'variables' => array('script' => ''), ); diff --git a/core/modules/system/tests/themes/test_theme_twig_registry_loader/templates/twig-registry-loader-test-extend-same-name.html.twig b/core/modules/system/tests/themes/test_theme_twig_registry_loader/templates/twig-registry-loader-test-extend-same-name.html.twig new file mode 100644 index 0000000..97eda90 --- /dev/null +++ b/core/modules/system/tests/themes/test_theme_twig_registry_loader/templates/twig-registry-loader-test-extend-same-name.html.twig @@ -0,0 +1,2 @@ +{% extends "twig-registry-loader-test-extend-same-name.html.twig" %} +{% set attributes = attributes.addClass('theme-test_theme_twig_registry_loader') %} diff --git a/core/modules/system/tests/themes/test_theme_twig_registry_loader_theme/templates/twig-registry-loader-test-extend-same-name.html.twig b/core/modules/system/tests/themes/test_theme_twig_registry_loader_theme/templates/twig-registry-loader-test-extend-same-name.html.twig new file mode 100644 index 0000000..2dd645e --- /dev/null +++ b/core/modules/system/tests/themes/test_theme_twig_registry_loader_theme/templates/twig-registry-loader-test-extend-same-name.html.twig @@ -0,0 +1,2 @@ +{% extends "twig-registry-loader-test-extend-same-name.html.twig" %} +{% set attributes = attributes.addClass('theme-test_theme_twig_registry_loader_theme') %}