From 33440933234353d810c9fcd447b03f553d5d3910 Mon Sep 17 00:00:00 2001 From: Gabor Hojtsy Date: Tue, 11 Jul 2017 17:14:08 +0200 Subject: [PATCH] Issue #2889378 by WidgetsBurritos, Manuel Garcia: Name test cases on HtmlTagTest --- .../Tests/Core/Render/Element/HtmlTagTest.php | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php b/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php index 713da2f9c0b..03f4232443b 100644 --- a/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php +++ b/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php @@ -48,20 +48,20 @@ class HtmlTagTest extends RendererTestBase { '#value' => 'value', '#tag' => 'p', ]; - $tags[] = [$element, '

value

' . "\n"]; + $tags['value'] = [$element, '

value

' . "\n"]; // Normal element without a value should not result in a void element. $element = [ '#tag' => 'p', '#value' => NULL, ]; - $tags[] = [$element, "

\n"]; + $tags['no-value'] = [$element, "

\n"]; // A void element. $element = [ '#tag' => 'br', ]; - $tags[] = [$element, "
\n"]; + $tags['void-element'] = [$element, "
\n"]; // Attributes. $element = [ @@ -69,32 +69,32 @@ class HtmlTagTest extends RendererTestBase { '#attributes' => ['class' => 'test', 'id' => 'id'], '#value' => 'value', ]; - $tags[] = [$element, '
value
' . "\n"]; + $tags['attributes'] = [$element, '
value
' . "\n"]; // No script tags. $element['#noscript'] = TRUE; - $tags[] = [$element, '']; + $tags['noscript'] = [$element, '']; // Ensure that #tag is sanitised. $element = [ '#tag' => 'p> 'value', ]; - $tags[] = [$element, "value\n"]; + $tags['sanitized-tag'] = [$element, "value\n"]; // Ensure that #value is not filtered if it is marked as safe. $element = [ '#tag' => 'p', '#value' => Markup::create(''), ]; - $tags[] = [$element, "

\n"]; + $tags['value-safe'] = [$element, "

\n"]; // Ensure that #value is filtered if it is not safe. $element = [ '#tag' => 'p', '#value' => '', ]; - $tags[] = [$element, "

value

\n"]; + $tags['value-not-safe'] = [$element, "

value

\n"]; // Ensure that nested render arrays render properly. $element = [ @@ -105,7 +105,7 @@ class HtmlTagTest extends RendererTestBase { ['#markup' => 'value2'], ], ]; - $tags[] = [$element, "

value1value2

\n"]; + $tags['nested'] = [$element, "

value1value2

\n"]; // Ensure svg elements. $element = [ @@ -117,7 +117,7 @@ class HtmlTagTest extends RendererTestBase { 'y' => 10, ], ]; - $tags[] = [$element, '' . "\n"]; + $tags['rect'] = [$element, '' . "\n"]; $element = [ '#tag' => 'circle', @@ -127,7 +127,7 @@ class HtmlTagTest extends RendererTestBase { 'r' => 100, ], ]; - $tags[] = [$element, '' . "\n"]; + $tags['circle'] = [$element, '' . "\n"]; $element = [ '#tag' => 'polygon', @@ -135,7 +135,7 @@ class HtmlTagTest extends RendererTestBase { 'points' => '60,20 100,40 100,80 60,100 20,80 20,40', ], ]; - $tags[] = [$element, '' . "\n"]; + $tags['polygon'] = [$element, '' . "\n"]; $element = [ '#tag' => 'ellipse', @@ -146,7 +146,7 @@ class HtmlTagTest extends RendererTestBase { 'ry' => 25, ], ]; - $tags[] = [$element, '' . "\n"]; + $tags['ellipse'] = [$element, '' . "\n"]; $element = [ '#tag' => 'use', @@ -157,7 +157,7 @@ class HtmlTagTest extends RendererTestBase { 'height' => 50, ], ]; - $tags[] = [$element, '' . "\n"]; + $tags['use'] = [$element, '' . "\n"]; $element = [ '#tag' => 'path', @@ -168,7 +168,7 @@ class HtmlTagTest extends RendererTestBase { 'stroke-width' => 3, ], ]; - $tags[] = [$element, '' . "\n"]; + $tags['path'] = [$element, '' . "\n"]; $element = [ '#tag' => 'stop', @@ -177,7 +177,7 @@ class HtmlTagTest extends RendererTestBase { 'stop-color' => '#F60', ], ]; - $tags[] = [$element, '' . "\n"]; + $tags['stop'] = [$element, '' . "\n"]; // Nested svg elements. $element = [ @@ -200,7 +200,7 @@ class HtmlTagTest extends RendererTestBase { ], ], ]; - $tags[] = [$element, '' . "\n" . '' . "\n" . '' . "\n"]; + $tags['linearGradient'] = [$element, '' . "\n" . '' . "\n" . '' . "\n"]; return $tags; } @@ -225,14 +225,14 @@ class HtmlTagTest extends RendererTestBase { $element = [ '#tag' => 'link', ]; - $tags[] = [$element, $element]; + $tags['no-browser'] = [$element, $element]; // Specify all browsers. $element['#browsers'] = [ 'IE' => TRUE, '!IE' => TRUE, ]; - $tags[] = [$element, $element]; + $tags['all-browsers'] = [$element, $element]; // All IE. $element = [ @@ -245,7 +245,7 @@ class HtmlTagTest extends RendererTestBase { $expected = $element; $expected['#prefix'] = "\n\n"; - $tags[] = [$element, $expected]; + $tags['all-ie'] = [$element, $expected]; // Exclude IE. $element = [ @@ -257,7 +257,7 @@ class HtmlTagTest extends RendererTestBase { $expected = $element; $expected['#prefix'] = "\n\n"; $expected['#suffix'] = "\n"; - $tags[] = [$element, $expected]; + $tags['no-ie'] = [$element, $expected]; // IE gt 8 $element = [ @@ -269,7 +269,7 @@ class HtmlTagTest extends RendererTestBase { $expected = $element; $expected['#prefix'] = "\n\n"; $expected['#suffix'] = "\n"; - $tags[] = [$element, $expected]; + $tags['ie9plus'] = [$element, $expected]; // Prefix and suffix filtering if not safe. $element = [ @@ -283,13 +283,13 @@ class HtmlTagTest extends RendererTestBase { $expected = $element; $expected['#prefix'] = "\n\nprefix"; $expected['#suffix'] = "suffix\n"; - $tags[] = [$element, $expected]; + $tags['non-ie-unsafe'] = [$element, $expected]; // Prefix and suffix filtering if marked as safe. This has to come after the // previous test case. $expected['#prefix'] = "\n\nprefix"; $expected['#suffix'] = "suffix\n"; - $tags[] = [$element, $expected, TRUE]; + $tags['non-ie-safe'] = [$element, $expected, TRUE]; return $tags; }