.
- * - region: The name of the region variable as defined in the theme's
- * .info.yml file.
- *
- * @see template_preprocess_region()
+ * - region: The name of the region variable.
*
* @ingroup themeable
*/
diff --git a/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php b/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php
index ea007e0..6378b76 100644
--- a/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php
+++ b/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php
@@ -99,7 +99,7 @@ public function testEntityForm() {
// Switch the layout to two columns.
$this->click('#edit-field-layouts');
- $this->getSession()->getPage()->selectFieldOption('field_layout', '2col');
+ $this->getSession()->getPage()->selectFieldOption('field_layout', 'twocol');
$this->submitForm([], 'Save');
$this->assertSession()->pageTextContains('Your settings have been saved.');
@@ -156,7 +156,7 @@ public function testEntityView() {
// Switch the layout to two columns.
$this->click('#edit-field-layouts');
- $this->getSession()->getPage()->selectFieldOption('field_layout', '2col');
+ $this->getSession()->getPage()->selectFieldOption('field_layout', 'twocol');
$this->submitForm([], 'Save');
$this->assertSession()->pageTextContains('Your settings have been saved.');
@@ -164,6 +164,7 @@ public function testEntityView() {
$this->drupalGet('entity_test/1');
// No fields are visible, and the regions don't display when empty.
+ $this->assertSession()->elementNotExists('css', '.field-layout--default');
$this->assertSession()->elementNotExists('css', '.field-layout-region');
$this->assertSession()->elementNotExists('css', '.field--name-field-test-text');
@@ -184,6 +185,7 @@ public function testEntityView() {
// The new layout is used.
$this->drupalGet('entity_test/1');
+ $this->assertSession()->elementExists('css', '.field-layout--twocol');
$this->assertSession()->elementExists('css', '.field-layout-region--left .field--name-field-test-text');
// Move the field to the right region without tabledrag.
@@ -201,6 +203,7 @@ public function testEntityView() {
// The layout is still in use without Field UI.
$this->container->get('module_installer')->uninstall(['field_ui']);
$this->drupalGet('entity_test/1');
+ $this->assertSession()->elementExists('css', '.field-layout--twocol');
$this->assertSession()->elementExists('css', '.field-layout-region--right .field--name-field-test-text');
}
@@ -210,6 +213,7 @@ public function testEntityView() {
public function testNodeView() {
// By default, the default layout is used.
$this->drupalGet('node/1');
+ $this->assertSession()->elementExists('css', '.field-layout--default');
$this->assertSession()->elementExists('css', '.field-layout-region--content .field--name-body');
$this->drupalGet('admin/structure/types/manage/article/display');
diff --git a/core/modules/field_layout/tests/src/Unit/LayoutRepositoryTest.php b/core/modules/field_layout/tests/src/Unit/LayoutRepositoryTest.php
index 303ce6c..8bbde70 100644
--- a/core/modules/field_layout/tests/src/Unit/LayoutRepositoryTest.php
+++ b/core/modules/field_layout/tests/src/Unit/LayoutRepositoryTest.php
@@ -20,7 +20,7 @@ class LayoutRepositoryTest extends UnitTestCase {
public function testGetLayoutDefinitions() {
$layout_repository = new LayoutRepository($this->getStringTranslationStub());
- $expected = ['default', '1col_stacked', '2col'];
+ $expected = ['default', 'twocol'];
$layout_definitions = $layout_repository->getLayoutDefinitions();
$this->assertEquals($expected, array_keys($layout_definitions));
@@ -33,11 +33,12 @@ public function testGetLayoutForDisplay() {
$layout_repository = new LayoutRepository($this->getStringTranslationStub());
$display = $this->prophesize(EntityDisplayInterface::class);
- $display->getThirdPartySetting('field_layout', 'layout', 'default')->willReturn('2col');
+ $display->getThirdPartySetting('field_layout', 'layout', 'default')->willReturn('twocol');
$expected = ['left', 'right'];
$layout_definition = $layout_repository->getLayoutForDisplay($display->reveal());
+ $this->assertSame('twocol', $layout_definition['layout']);
$this->assertEquals($expected, array_keys($layout_definition['regions']));
}
@@ -53,6 +54,7 @@ public function testGetLayoutForDisplayEmpty() {
$expected = ['content'];
$layout_definition = $layout_repository->getLayoutForDisplay($display->reveal());
+ $this->assertSame('default', $layout_definition['layout']);
$this->assertEquals($expected, array_keys($layout_definition['regions']));
}
diff --git a/core/tests/Drupal/Tests/BrowserTestBase.php b/core/tests/Drupal/Tests/BrowserTestBase.php
index ccbc142..ea88906 100644
--- a/core/tests/Drupal/Tests/BrowserTestBase.php
+++ b/core/tests/Drupal/Tests/BrowserTestBase.php
@@ -1547,8 +1547,8 @@ protected function htmlOutput($message) {
if (!$this->htmlOutputEnabled) {
return;
}
- $message = '
ID #' . $this->htmlOutputCounter . ' (
Previous |
Next)
' . $message;
- $html_output_filename = $this->htmlOutputClassName . '-' . $this->htmlOutputCounter . '.html';
+ $message = '
ID #' . $this->htmlOutputCounter . ' (
Previous |
Next)
' . $message;
+ $html_output_filename = $this->htmlOutputClassName . '-' . $this->htmlOutputCounter . '-' . $this->htmlOutputTestId . '.html';
file_put_contents($this->htmlOutputDirectory . '/' . $html_output_filename, $message);
file_put_contents($this->htmlOutputCounterStorage, $this->htmlOutputCounter++);
file_put_contents($this->htmlOutputFile, file_create_url('sites/simpletest/browser_output/' . $html_output_filename) . "\n", FILE_APPEND);