/", IdomAsyncWebsocketConsumer.as_asgi()
)
+
"""A URL path for :class:`IdomAsyncWebsocketConsumer`.
Required in order for IDOM to know the websocket path.
diff --git a/tests/test_app/components.py b/tests/test_app/components.py
index d3452efb..2efd878c 100644
--- a/tests/test_app/components.py
+++ b/tests/test_app/components.py
@@ -1,13 +1,15 @@
import idom
+import django_idom
+
@idom.component
-def HelloWorld(websocket):
+def HelloWorld():
return idom.html.h1({"id": "hello-world"}, "Hello World!")
@idom.component
-def Button(websocket):
+def Button():
count, set_count = idom.hooks.use_state(0)
return idom.html.div(
idom.html.button(
@@ -22,7 +24,7 @@ def Button(websocket):
@idom.component
-def ParametrizedComponent(websocket, x, y):
+def ParametrizedComponent(x, y):
total = x + y
return idom.html.h1({"id": "parametrized-component", "data-value": total}, total)
@@ -32,5 +34,40 @@ def ParametrizedComponent(websocket, x, y):
@idom.component
-def SimpleBarChart(websocket):
+def SimpleBarChart():
return VictoryBar()
+
+
+@idom.component
+def UseWebsocket():
+ ws = django_idom.hooks.use_websocket()
+ ws.scope = "..."
+ success = bool(ws.scope and ws.close and ws.disconnect and ws.view_id)
+ return idom.html.div(
+ {"id": "use-websocket", "data-success": success},
+ idom.html.hr(),
+ f"UseWebsocket: {ws}",
+ idom.html.hr(),
+ )
+
+
+@idom.component
+def UseScope():
+ scope = django_idom.hooks.use_scope()
+ success = len(scope) >= 10 and scope["type"] == "websocket"
+ return idom.html.div(
+ {"id": "use-scope", "data-success": success},
+ f"UseScope: {scope}",
+ idom.html.hr(),
+ )
+
+
+@idom.component
+def UseLocation():
+ location = django_idom.hooks.use_location()
+ success = bool(location)
+ return idom.html.div(
+ {"id": "use-location", "data-success": success},
+ f"UseLocation: {location}",
+ idom.html.hr(),
+ )
diff --git a/tests/test_app/settings.py b/tests/test_app/settings.py
index 29eadffa..fbacac81 100644
--- a/tests/test_app/settings.py
+++ b/tests/test_app/settings.py
@@ -121,3 +121,20 @@
"django.contrib.staticfiles.finders.FileSystemFinder",
"django.contrib.staticfiles.finders.AppDirectoriesFinder",
]
+
+# Logging
+LOGGING = {
+ "version": 1,
+ "disable_existing_loggers": False,
+ "handlers": {
+ "console": {
+ "class": "logging.StreamHandler",
+ },
+ },
+ "loggers": {
+ "django_idom": {
+ "handlers": ["console"],
+ "level": "DEBUG",
+ },
+ },
+}
diff --git a/tests/test_app/templates/base.html b/tests/test_app/templates/base.html
index 5b2311d2..0c52a8cc 100644
--- a/tests/test_app/templates/base.html
+++ b/tests/test_app/templates/base.html
@@ -12,11 +12,13 @@
IDOM Test Page
- {% idom_component "test_app.components.HelloWorld" class="hello-world" %}
- {% idom_component "test_app.components.Button" class="button" %}
- {% idom_component "test_app.components.ParametrizedComponent" class="parametarized-component" x=123 y=456 %}
-
- {% idom_component "test_app.components.SimpleBarChart" class="simple-bar-chart" %}
+ {% component "test_app.components.HelloWorld" class="hello-world" %}
+ {% component "test_app.components.Button" class="button" %}
+ {% component "test_app.components.ParametrizedComponent" class="parametarized-component" x=123 y=456 %}
+ {% component "test_app.components.SimpleBarChart" %}
+ {% component "test_app.components.UseWebsocket" %}
+ {% component "test_app.components.UseScope" %}
+ {% component "test_app.components.UseLocation" %}
diff --git a/tests/test_app/tests/test_components.py b/tests/test_app/tests/test_components.py
index cb10cca9..fbfda829 100644
--- a/tests/test_app/tests/test_components.py
+++ b/tests/test_app/tests/test_components.py
@@ -5,7 +5,7 @@
from selenium import webdriver
from selenium.webdriver.common.by import By
from selenium.webdriver.support import expected_conditions
-from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.support.wait import WebDriverWait
# These tests are broken on Windows due to Selenium
@@ -47,6 +47,18 @@ def test_component_from_web_module(self):
)
)
+ def test_use_websocket(self):
+ element = self.driver.find_element_by_id("use-websocket")
+ self.assertEqual(element.get_attribute("data-success"), "true")
+
+ def test_use_scope(self):
+ element = self.driver.find_element_by_id("use-scope")
+ self.assertEqual(element.get_attribute("data-success"), "true")
+
+ def test_use_location(self):
+ element = self.driver.find_element_by_id("use-location")
+ self.assertEqual(element.get_attribute("data-success"), "true")
+
def make_driver(page_load_timeout, implicit_wait_timeout):
options = webdriver.ChromeOptions()
diff --git a/tests/test_app/tests/test_regex.py b/tests/test_app/tests/test_regex.py
index 3e418f1d..c0942dba 100644
--- a/tests/test_app/tests/test_regex.py
+++ b/tests/test_app/tests/test_regex.py
@@ -6,22 +6,23 @@
class RegexTests(TestCase):
def test_component_regex(self):
for component in {
- r'{%idom_component "my.component"%}',
- r"{%idom_component 'my.component'%}",
- r'{% idom_component "my.component" %}',
- r"{% idom_component 'my.component' %}",
- r'{% idom_component "my.component" class="my_thing" %}',
- r'{% idom_component "my.component" class="my_thing" attr="attribute" %}',
+ r'{%component "my.component"%}',
+ r'{%component "my.component"%}',
+ r"{%component 'my.component'%}",
+ r'{% component "my.component" %}',
+ r"{% component 'my.component' %}",
+ r'{% component "my.component" class="my_thing" %}',
+ r'{% component "my.component" class="my_thing" attr="attribute" %}',
}:
self.assertRegex(component, COMPONENT_REGEX)
for fake_component in {
r'{% not_a_real_thing "my.component" %}',
- r"{% idom_component my.component %}",
- r"""{% idom_component 'my.component" %}""",
- r'{ idom_component "my.component" }',
- r'{{ idom_component "my.component" }}',
- r"idom_component",
+ r"{% component my.component %}",
+ r"""{% component 'my.component" %}""",
+ r'{ component "my.component" }',
+ r'{{ component "my.component" }}',
+ r"component",
r"{%%}",
r" ",
r"",
-