Fix issue with resolving path (#50)

jonathan-s · web-flow · commit 4be456047083 · 2020-12-22T23:31:18.000+01:00
diff --git a/cypress/integration/websocket_spec.js b/cypress/integration/websocket_spec.js
@@ -12,12 +12,21 @@ describe("Integration tests", () => {
     cy.get('#counter').should('have.text', '1')
   }),
 
-  it("able to use reflex which isn't registered", () => {
+  it("are able to use reflex which isn't registered", () => {
     cy.visit('/test/')
     cy.get('#counter-2').should('have.text', '0')
     cy.wait(200)
 
     cy.get('#decrementor').click()
     cy.get('#counter-2').should('have.text', '-1')
   })
+
+  it("get parameters won't throw exceptions when triggering reflex", () => {
+    cy.visit('/param/?word=world')
+    cy.get('#word').should('have.text', 'world')
+    cy.wait(200)
+
+    cy.get('#button').click()
+    cy.get('#word').should('have.text', 'space')
+  })
 })
diff --git a/sockpuppet/consumer.py b/sockpuppet/consumer.py
@@ -221,8 +221,7 @@ def render_page_and_broadcast_morph(self, reflex, selectors, data):
 
     def render_page(self, reflex):
         parsed_url = urlparse(reflex.url)
-        url_path = parsed_url.path + parsed_url.query
-        resolved = resolve(url_path)
+        resolved = resolve(parsed_url.path)
         view = resolved.func
 
         instance_variables = [
diff --git a/tests/example/reflexes/example_reflex.py b/tests/example/reflexes/example_reflex.py
@@ -9,3 +9,8 @@ def increment(self, step=1):
 class DecrementReflex(Reflex):
     def decrement(self, step=1):
         self.session['otherCount'] = int(self.element.dataset['count']) - step
+
+
+class ParamReflex(Reflex):
+    def change_word(self):
+        self.word = 'space'
diff --git a/tests/example/templates/param.html b/tests/example/templates/param.html
@@ -0,0 +1,15 @@
+{% load static %}
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <script src="{% static 'js/example.js' %}"></script>
+  <title>Param view</title>
+</head>
+<body>
+  Hello <span id="word">{{ word }}</span>
+  <button id="button" data-reflex="click->ParamReflex#change_word">Change me</button>
+</body>
+</html>
diff --git a/tests/example/urls.py b/tests/example/urls.py
@@ -16,8 +16,9 @@
 
 from django.urls import path
 
-from .views.example import ExampleView
+from .views.example import ExampleView, ParamView
 
 urlpatterns = [
-    path('test/', ExampleView.as_view(), name='example')
+    path('test/', ExampleView.as_view(), name='example'),
+    path('param/', ParamView.as_view(), name='param')
 ]
diff --git a/tests/example/views/example.py b/tests/example/views/example.py
@@ -9,3 +9,12 @@ def get_context_data(self, *args, **kwargs):
         context['count'] = self.request.session.get('count', 0)
         context['otherCount'] = self.request.session.get('otherCount', 0)
         return context
+
+
+class ParamView(TemplateView):
+    template_name = 'param.html'
+
+    def get(self, request, *args, **kwargs):
+        kwargs.update(dict(self.request.GET.items()))
+        context = self.get_context_data(**kwargs)
+        return self.render_to_response(context)

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,9 @@`
`16`	`16`
`17`	`17`	`from django.urls import path`
`18`	`18`
`19`		`-from .views.example import ExampleView`
	`19`	`+from .views.example import ExampleView, ParamView`
`20`	`20`
`21`	`21`	`urlpatterns = [`
`22`		`- path('test/', ExampleView.as_view(), name='example')`
	`22`	`+ path('test/', ExampleView.as_view(), name='example'),`
	`23`	`+ path('param/', ParamView.as_view(), name='param')`
`23`	`24`	`]`