Add coverage for component head element collection

rthrfrd · Dec 6, 2023 · d8fdedb · d8fdedb
1 parent 3ed42fa
commit d8fdedb
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 4 deletions.
diff --git a/include/webxx.h b/include/webxx.h
@@ -982,14 +982,14 @@ namespace Webxx { namespace internal {
                 if (!node.data.attributes.empty()) {
                     render(node.data.attributes, nextComponent);
                 }
-                if (node.data.options.selfClosing) {
-                    sendToRender("/");
-                }
                 if (nextComponent) {
                     sendToRender(" ");
                     sendToRender(componentScopePrefix);
                     sendToRender(componentName(nextComponent));
                 }
+                if (node.data.options.selfClosing) {
+                    sendToRender("/");
+                }
                 sendToRender(">");
             }
 

diff --git a/test/unit/Component.cpp b/test/unit/Component.cpp
@@ -20,7 +20,9 @@ TEST_SUITE("Component") {
                     h1{{_class{"title"}}, "Hello"},
                     p{{_class{"summary"}}, "World."},
                 },
-
+                {
+                    link{{_rel{"test"}}},
+                },
             } {}
         };
 
@@ -75,6 +77,33 @@ TEST_SUITE("Component") {
 
             CHECK(renderCss(myPage) == fmt::format(".title[data-c{0}]{{color:green;}}.summary[data-c{0}]{{color:blue;}}", myComId));
         }
+
+        SUBCASE("Component head elements are collected and rendered") {
+            html myPage {
+                head {
+                    headTarget{},
+                },
+                body {
+                    MyCom{},
+                    MyCom{},
+                },
+            };
+
+            CHECK(render(myPage) == fmt::format(
+            "<html>"
+                    "<head>"
+                        // Collected elements only appears once:
+                        "<link rel=\"test\" data-c{0}/>"
+                    "</head>"
+                    "<body>"
+                        // HTML appears twice:
+                        "<div data-c{0}><h1 class=\"title\" data-c{0}>Hello</h1><p class=\"summary\" data-c{0}>World.</p></div>"
+                        "<div data-c{0}><h1 class=\"title\" data-c{0}>Hello</h1><p class=\"summary\" data-c{0}>World.</p></div>"
+                    "</body>"
+                "</html>",
+                myComId
+            ));
+        }
     }
 
     TEST_CASE("Components can be nested") {