From 219d5ca4169b5c5dce813de6db9ea573e66e3ab4 Mon Sep 17 00:00:00 2001 From: Brian Kohan Date: Tue, 21 Nov 2023 10:37:07 -0800 Subject: [PATCH] fix #133 and #134 --- render_static/tests/js_tests.py | 11 +++++++++-- render_static/transpilers/urls_to_js.py | 8 ++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/render_static/tests/js_tests.py b/render_static/tests/js_tests.py index c4d98c3..8bb6f1f 100644 --- a/render_static/tests/js_tests.py +++ b/render_static/tests/js_tests.py @@ -1081,9 +1081,16 @@ def test_class_url_overrides(self): self.assertEqual(js_dict['app2:app1:re_path_unnamed'][key], value) self.assertEqual(js_dict['path_tst'], '/test/different/1/xo') - self.assertTrue(js_dict['deepEqual']) - for func in ['constructor', 'match', 'deepEqual', 'isObject', 'reverse']: + functions = ['constructor', 'match', 'reverse'] + if DJANGO_VERSION[0:2] < (4, 1): # pragma: no cover + self.assertTrue(js_dict['deepEqual']) + functions.append('deepEqual') + functions.append('isObject') + else: # pragma: no cover + pass + + for func in functions: for key, value in expected_context.items(): self.assertEqual(js_dict[func + '_ctx'][key], value) diff --git a/render_static/transpilers/urls_to_js.py b/render_static/transpilers/urls_to_js.py index 501da57..2075092 100644 --- a/render_static/transpilers/urls_to_js.py +++ b/render_static/transpilers/urls_to_js.py @@ -1199,7 +1199,9 @@ def impl() -> Generator[str, None, None]: self.outdent() yield '}' - def deep_equal(self) -> Generator[Optional[str], None, None]: + def deep_equal( + self + ) -> Generator[Optional[str], None, None]: # pragma: no cover """ The recursive deepEqual function. :yield: The JavaScript jdoc comment lines and deepEqual function. @@ -1255,7 +1257,9 @@ def impl() -> Generator[str, None, None]: self.outdent() yield '}' - def is_object(self) -> Generator[Optional[str], None, None]: + def is_object( + self + ) -> Generator[Optional[str], None, None]: # pragma: no cover """ The isObject() function. :yield: The JavaScript jdoc comment lines and isObject function.