From 835cf25de24f91f01eacc44648d3db55821519fc Mon Sep 17 00:00:00 2001
From: Berend Klein Haneveld <berendkleinhaneveld@gmail.com>
Date: Tue, 7 May 2024 23:24:35 +0200
Subject: [PATCH] More cleanup

---
 tests/test_tag_template.py         | 52 +++++++++++++++++++++++++++++-
 tests_legacy/data/template.cgx     | 21 ------------
 tests_legacy/test_template_tags.py | 29 -----------------
 3 files changed, 51 insertions(+), 51 deletions(-)
 delete mode 100644 tests_legacy/data/template.cgx
 delete mode 100644 tests_legacy/test_template_tags.py

diff --git a/tests/test_tag_template.py b/tests/test_tag_template.py
index 435c980..dd56744 100644
--- a/tests/test_tag_template.py
+++ b/tests/test_tag_template.py
@@ -1,8 +1,10 @@
+from observ import reactive
+
 from collagraph import Collagraph, EventLoopType
 from collagraph.renderers import DictRenderer
 
 
-def test_basic_dict_renderer(parse_source):
+def test_tag_template(parse_source):
     App, _ = parse_source(
         """
         <template>
@@ -32,3 +34,51 @@ class App(cg.Component):
     _ = None
     container = None
     gui = None
+
+
+def test_component_template_tag(parse_source):
+    Template, _ = parse_source(
+        """
+        <template>
+          <content>
+            <template>
+              <child name="a" />
+              <child name="b" />
+            </template>
+            <!-- FIXME: v-if="more" creates NameError -->
+            <template v-if="props['more']">
+              <child name="c" />
+              <child name="d" />
+            </template>
+          </content>
+        </template>
+
+        <script lang="python">
+        import collagraph as cg
+
+        class Template(cg.Component):
+            pass
+        </script>
+        """
+    )
+
+    gui = Collagraph(DictRenderer(), event_loop_type=EventLoopType.SYNC)
+    container = {"type": "root"}
+    state = reactive({"more": False})
+
+    gui.render(Template, container, state=state)
+
+    content = container["children"][0]
+    assert content["type"] == "content"
+
+    assert len(content["children"]) == 2
+    for child, name in zip(content["children"], ["a", "b"]):
+        assert child["type"] == "child"
+        assert child["attrs"]["name"] == name
+
+    state["more"] = True
+
+    assert len(content["children"]) == 4
+    for child, name in zip(content["children"], ["a", "b", "c", "d"]):
+        assert child["type"] == "child"
+        assert child["attrs"]["name"] == name
diff --git a/tests_legacy/data/template.cgx b/tests_legacy/data/template.cgx
deleted file mode 100644
index 53c4faa..0000000
--- a/tests_legacy/data/template.cgx
+++ /dev/null
@@ -1,21 +0,0 @@
-<template>
-  <content>
-    <template>
-      <child name="a" />
-      <child name="b" />
-    </template>
-    <!-- FIXME: v-if="more" creates NameError -->
-    <template v-if="props['more']">
-      <child name="c" />
-      <child name="d" />
-    </template>
-  </content>
-</template>
-
-<script lang="python">
-import collagraph as cg
-
-class Template(cg.Component):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-</script>
diff --git a/tests_legacy/test_template_tags.py b/tests_legacy/test_template_tags.py
deleted file mode 100644
index 14d6e72..0000000
--- a/tests_legacy/test_template_tags.py
+++ /dev/null
@@ -1,29 +0,0 @@
-from observ import reactive
-
-import collagraph as cg
-
-
-def test_component_template_tag():
-    from tests.data.template import Template
-
-    gui = cg.Collagraph(cg.DictRenderer(), event_loop_type=cg.EventLoopType.SYNC)
-    container = {"type": "root"}
-    state = reactive({"more": False})
-    element = cg.h(Template, state)
-
-    gui.render(element, container)
-
-    content = container["children"][0]
-    assert content["type"] == "content"
-
-    assert len(content["children"]) == 2
-    for child, name in zip(content["children"], ["a", "b"]):
-        assert child["type"] == "child"
-        assert child["attrs"]["name"] == name
-
-    state["more"] = True
-
-    assert len(content["children"]) == 4
-    for child, name in zip(content["children"], ["a", "b", "c", "d"]):
-        assert child["type"] == "child"
-        assert child["attrs"]["name"] == name