revert idom.html changes in tests

Author: Archmonger

tests/test_app/components.py

@@ -1,5 +1,4 @@
 import idom
-from idom import html
 from test_app.models import TodoItem
 
 import django_idom
@@ -8,18 +7,18 @@
 
 @idom.component
 def hello_world():
-    return html.h1({"id": "hello-world"}, "Hello World!")
+    return idom.html.h1({"id": "hello-world"}, "Hello World!")
 
 
 @idom.component
 def button():
     count, set_count = idom.hooks.use_state(0)
-    return html.div(
-        html.button(
+    return idom.html.div(
+        idom.html.button(
             {"id": "counter-inc", "onClick": lambda event: set_count(count + 1)},
             "Click me!",
         ),
-        html.p(
+        idom.html.p(
             {"id": "counter-num", "data-count": count},
             f"Current count is: {count}",
         ),
@@ -29,7 +28,7 @@ def button():
 @idom.component
 def parameterized_component(x, y):
     total = x + y
-    return html.h1({"id": "parametrized-component", "data-value": total}, total)
+    return idom.html.h1({"id": "parametrized-component", "data-value": total}, total)
 
 
 victory = idom.web.module_from_template("react", "victory-bar", fallback="...")
@@ -46,90 +45,90 @@ def use_websocket():
     ws = django_idom.hooks.use_websocket()
     ws.scope = "..."
     success = bool(ws.scope and ws.close and ws.disconnect and ws.view_id)
-    return html.div(
+    return idom.html.div(
         {"id": "use-websocket", "data-success": success},
-        html.hr(),
+        idom.html.hr(),
         f"use_websocket: {ws}",
-        html.hr(),
+        idom.html.hr(),
     )
 
 
 @idom.component
 def use_scope():
     scope = django_idom.hooks.use_scope()
     success = len(scope) >= 10 and scope["type"] == "websocket"
-    return html.div(
+    return idom.html.div(
         {"id": "use-scope", "data-success": success},
         f"use_scope: {scope}",
-        html.hr(),
+        idom.html.hr(),
     )
 
 
 @idom.component
 def use_location():
     location = django_idom.hooks.use_location()
     success = bool(location)
-    return html.div(
+    return idom.html.div(
         {"id": "use-location", "data-success": success},
         f"use_location: {location}",
-        html.hr(),
+        idom.html.hr(),
     )
 
 
 @idom.component
 def django_css():
-    return html.div(
+    return idom.html.div(
         {"id": "django-css"},
         django_idom.components.django_css("django-css-test.css"),
-        html.div({"style": {"display": "inline"}}, "django_css: "),
-        html.button("This text should be blue."),
-        html.hr(),
+        idom.html.div({"style": {"display": "inline"}}, "django_css: "),
+        idom.html.button("This text should be blue."),
+        idom.html.hr(),
     )
 
 
 @idom.component
 def django_js():
     success = False
-    return html._(
-        html.div(
+    return idom.html._(
+        idom.html.div(
             {"id": "django-js", "data-success": success},
             f"django_js: {success}",
             django_idom.components.django_js("django-js-test.js"),
         ),
-        html.hr(),
+        idom.html.hr(),
     )
 
 
 @idom.component
 @django_idom.decorators.auth_required(
-    fallback=html.div(
+    fallback=idom.html.div(
         {"id": "unauthorized-user-fallback"},
         "unauthorized_user: Success",
-        html.hr(),
+        idom.html.hr(),
     )
 )
 def unauthorized_user():
-    return html.div(
+    return idom.html.div(
         {"id": "unauthorized-user"},
         "unauthorized_user: Fail",
-        html.hr(),
+        idom.html.hr(),
     )
 
 
 @idom.component
 @django_idom.decorators.auth_required(
     auth_attribute="is_anonymous",
-    fallback=html.div(
+    fallback=idom.html.div(
         {"id": "authorized-user-fallback"},
         "authorized_user: Fail",
-        html.hr(),
+        idom.html.hr(),
     ),
 )
 def authorized_user():
-    return html.div(
+    return idom.html.div(
         {"id": "authorized-user"},
         "authorized_user: Success",
-        html.hr(),
+        idom.html.hr(),
     )
 
 
@@ -161,23 +160,23 @@ def todo_list():
     toggle_item = use_mutation(toggle_item_mutation, refetch=get_items_query)
 
     if items.error:
-        rendered_items = html.h2(f"Error when loading - {items.error}")
+        rendered_items = idom.html.h2(f"Error when loading - {items.error}")
     elif items.data is None:
-        rendered_items = html.h2("Loading...")
+        rendered_items = idom.html.h2("Loading...")
     else:
-        rendered_items = html._(
-            html.h3("Not Done"),
+        rendered_items = idom.html._(
+            idom.html.h3("Not Done"),
             _render_items([i for i in items.data if not i.done], toggle_item),
-            html.h3("Done"),
+            idom.html.h3("Done"),
             _render_items([i for i in items.data if i.done], toggle_item),
         )
 
     add_item = use_mutation(add_item_mutation, refetch=get_items_query)
 
     if add_item.loading:
-        mutation_status = html.h2("Working...")
+        mutation_status = idom.html.h2("Working...")
     elif add_item.error:
-        mutation_status = html.h2(f"Error when adding - {add_item.error}")
+        mutation_status = idom.html.h2(f"Error when adding - {add_item.error}")
     else:
         mutation_status = ""
 
@@ -189,9 +188,9 @@ def on_submit(event):
     def on_change(event):
         set_input_value(event["target"]["value"])
 
-    return html.div(
-        html.label("Add an item:"),
-        html.input(
+    return idom.html.div(
+        idom.html.label("Add an item:"),
+        idom.html.input(
             {
                 "type": "text",
                 "id": "todo-input",
@@ -206,12 +205,12 @@ def on_change(event):
 
 
 def _render_items(items, toggle_item):
-    return html.ul(
+    return idom.html.ul(
         [
-            html.li(
+            idom.html.li(
                 {"id": f"todo-item-{item.text}"},
                 item.text,
-                html.input(
+                idom.html.input(
                     {
                         "id": f"todo-item-{item.text}-checkbox",
                         "type": "checkbox",