Array in attribute value gets joined by space, replaced most assertEq…

…uals() with assertTag() in unit test
CHH · Mar 9, 2012 · 2ffa5be · 2ffa5be
1 parent 7d3547a
commit 2ffa5be
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 12 deletions.
diff --git a/lib/Jazz.php b/lib/Jazz.php
@@ -107,6 +107,7 @@ protected static function renderHtmlTag($node)
         $out = "<$tagName";
 
         foreach ($attributes as $attr => $value) {
+            if (is_array($value)) $value = join(" ", $value);
             $out .= " $attr=\"$value\"";
         }
 

diff --git a/tests/JazzTest.php b/tests/JazzTest.php
@@ -2,42 +2,46 @@
 
 class JazzTest extends \PHPUnit_Framework_TestCase
 {
-    function testSimpleTagWithoutAttributesAndBody()
+    function testShortTag()
     {
         $this->assertEquals(
             "<br />",
             Jazz::render(["#br"])
         );
     }
 
-    function testSecondElementCanBeAttributes()
+    function testShortTagWithAttributes()
     {
-        $this->assertEquals(
-            '<img src="/foo/bar.png" />',
+        $this->assertTag(
+            ["tag" => "img", "attributes" => ["src" => "/foo/bar.png"]],
             Jazz::render(["#img", ["src" => "/foo/bar.png"]])
         );
     }
 
-    function testTagsCanHaveTextContent()
+    function testShortTagWithContent()
     {
-        $this->assertEquals(
-            "<p>Foo</p>",
+        $this->assertTag(
+            ["tag" => "p", "content" => "Foo"],
             Jazz::render(["#p", "Foo"])
         );
     }
 
     function testRendersEmptyBody()
     {
         $this->assertEquals(
-            "<p></p>",
+            '<p></p>',
             Jazz::render(["#p", ""])
         );
     }
 
     function testTagWithAttributesAndBody()
     {
-        $this->assertEquals(
-            '<h1 role="banner">Unicorns and Rainbows</h1>',
+        $this->assertTag(
+            [
+                "tag" => "h1",
+                "attributes" => ["role" => "banner"],
+                "content" => "Unicorns and Rainbows"
+            ],
             Jazz::render(
                 ["#h1", ["role" => "banner"], "Unicorns and Rainbows"]
             )
@@ -46,8 +50,16 @@ function testTagWithAttributesAndBody()
 
     function testTagWithNestedTags()
     {
-        $this->assertEquals(
-            '<nav class="main"><a href="/">Front Page</a></nav>',
+        $this->assertTag(
+            [
+                "tag" => "nav",
+                "attributes" => ["class" => "main"],
+                "child" => [
+                    "tag" => "a",
+                    "attributes" => ["href" => "/"],
+                    "content" => "Front Page"
+                ]
+            ],
             Jazz::render(["#nav", ["class" => "main"], [
                 ["#a", ["href" => "/"], "Front Page"]
             ]])
@@ -96,4 +108,17 @@ function testThrowsExceptionWhenTooManyElementsInTag()
     {
         Jazz::render(["#p", "foo", "bar", "baz"]);
     }
+
+    function testJoinsMultipleAttributeValues()
+    {
+        $expected = [
+            "tag" => "p",
+            "attributes" => [
+                "class" => "foo bar baz"
+            ]
+        ];
+
+        $actual = Jazz::render(["#p", ["class" => ["foo", "bar", "baz"], "Foo"]]);
+        $this->assertTag($expected, $actual);
+    }
 }