Fix bug and fix and improve test

adamghill · Feb 13, 2023 · f1c9299 · f1c9299
1 parent 5f63d4f
commit f1c9299
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 6 deletions.
diff --git a/django_unicorn/templatetags/unicorn.py b/django_unicorn/templatetags/unicorn.py
@@ -124,7 +124,7 @@ def render(self, context):
             # if there is no explicit parent, but this node is rendering under an existing
             # unicorn template, set that as the parent
             try:
-                implicit_parent = template.Variable("unicorn.parent").resolve(context)
+                implicit_parent = template.Variable("unicorn.component").resolve(context)
                 if implicit_parent:
                     self.parent = implicit_parent
             except template.VariableDoesNotExist:

diff --git a/tests/templates/test_component_child_implicit.html b/tests/templates/test_component_child_implicit.html
@@ -0,0 +1,4 @@
+<div>
+  ==child==
+  has_parent:{{ has_parent }}
+</div>
diff --git a/tests/templates/test_component_parent_implicit.html b/tests/templates/test_component_parent_implicit.html
@@ -2,5 +2,5 @@
 
 <div>
   --parent--
-  {% unicorn 'tests.templatetags.test_unicorn_render.FakeComponentChild' %}
-</div>
+  {% unicorn 'tests.templatetags.test_unicorn_render.FakeComponentChildImplicit' %}
+</div>
diff --git a/tests/templates/test_parent_implicit_template.html b/tests/templates/test_parent_implicit_template.html
@@ -0,0 +1,3 @@
+{% load unicorn %}
+
+{% unicorn 'tests.templatetags.test_unicorn_render.FakeComponentParentImplicit' %}
diff --git a/tests/templatetags/test_unicorn_render.py b/tests/templatetags/test_unicorn_render.py
@@ -30,10 +30,21 @@ class FakeComponentParent(UnicornView):
     template_name = "templates/test_component_parent.html"
 
 
+class FakeComponentParentImplicit(UnicornView):
+    template_name = "templates/test_component_parent_implicit.html"
+
+
 class FakeComponentChild(UnicornView):
     template_name = "templates/test_component_child.html"
 
 
+class FakeComponentChildImplicit(UnicornView):
+    template_name = "templates/test_component_child_implicit.html"
+
+    def has_parent(self):
+        return self.parent is not None
+
+
 class FakeComponentKwargs(UnicornView):
     template_name = "templates/test_component_kwargs.html"
     hello = "world"
@@ -134,15 +145,16 @@ def test_unicorn_template_renders_with_implicit_parent_and_child(client):
     assert response.wsgi_request.path == "/test-parent-implicit"
     assert content.startswith("<div unicorn:id")
     assert (
-        'unicorn:name="tests.templatetags.test_unicorn_render.FakeComponentParent"'
+        'unicorn:name="tests.templatetags.test_unicorn_render.FakeComponentParentImplicit"'
         in content
     )
     assert (
-        'unicorn:name="tests.templatetags.test_unicorn_render.FakeComponentChild"'
+        'unicorn:name="tests.templatetags.test_unicorn_render.FakeComponentChildImplicit"'
         in content
     )
     assert "--parent--" in content
     assert "==child==" in content
+    assert "has_parent:True" in content
     assert '<script type="application/json" id="unicorn:data:' in content
 
 

diff --git a/tests/urls.py b/tests/urls.py
@@ -8,7 +8,7 @@ def parent_view(request):
 
 
 def parent_implicit_view(request):
-    return render(request, "templates/test_parent_template.html")
+    return render(request, "templates/test_parent_implicit_template.html")
 
 
 urlpatterns = (
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		{% load unicorn %}

		{% unicorn 'tests.templatetags.test_unicorn_render.FakeComponentParentImplicit' %}