From ca4e65e92628830db2b0994f1beee323255e1137 Mon Sep 17 00:00:00 2001 From: Jens Kleineheismann Date: Tue, 26 Nov 2019 10:23:08 +0100 Subject: [PATCH] The root route (url '/' => pattern '^') should now be correct. --- src/django_deploy/hooks.py | 2 +- src/django_deploy/tests/test_api.py | 2 +- src/django_deploy/tests/test_program.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/django_deploy/hooks.py b/src/django_deploy/hooks.py index cdfe4c2..0896ad2 100644 --- a/src/django_deploy/hooks.py +++ b/src/django_deploy/hooks.py @@ -24,7 +24,7 @@ def get_urlpatterns(file_path, urlpatterns): if 'MOUNT' in config[app]: route, urlconf_module = config[app]['MOUNT'] if route == '/': - pattern = '^$' + pattern = '^' else: pattern = '^{}'.format(route) url_obj = url(pattern, include(urlconf_module)) diff --git a/src/django_deploy/tests/test_api.py b/src/django_deploy/tests/test_api.py index 970ea6c..fc4d5cb 100644 --- a/src/django_deploy/tests/test_api.py +++ b/src/django_deploy/tests/test_api.py @@ -174,7 +174,7 @@ class DjangoProjectTestCase(DjangoDeployTestCase): project.mount_app('django_deploy.tests.fake_app1', '') expected_urlpatterns = [ - ('URLResolver', '^$', 'django_deploy.tests.fake_app1.urls'), + ('URLResolver', '^', 'django_deploy.tests.fake_app1.urls'), ] self.assert_urlpatterns(project_dir, expected_urlpatterns) diff --git a/src/django_deploy/tests/test_program.py b/src/django_deploy/tests/test_program.py index 4d00317..ba4dc63 100644 --- a/src/django_deploy/tests/test_program.py +++ b/src/django_deploy/tests/test_program.py @@ -148,7 +148,7 @@ class ProgramTestCase(DjangoDeployTestCase): # Similar code from test_api.test_mount_apps expected_urlpatterns = [ - ('URLResolver', '^$', 'django_deploy.tests.fake_app1.urls'), + ('URLResolver', '^', 'django_deploy.tests.fake_app1.urls'), ('URLResolver', '^app2/', 'django_deploy.tests.fake_app2.urls'), ]