From 0815f79739af44c592c2fe9ef0b6eb3d8ad3da95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20P=C3=A9pin?= Date: Thu, 17 Sep 2020 21:36:53 +0200 Subject: [PATCH] Update auth urls in tests --- cof/urls.py | 2 +- kfet/auth/tests.py | 12 +++++++++--- kfet/tests/test_statistic.py | 4 ++-- kfet/tests/test_views.py | 12 ++++++------ kfet/tests/testcases.py | 4 +++- shared/tests/mixins.py | 2 +- 6 files changed, 22 insertions(+), 14 deletions(-) diff --git a/cof/urls.py b/cof/urls.py index 1de437ed..b305967a 100644 --- a/cof/urls.py +++ b/cof/urls.py @@ -31,7 +31,7 @@ app_dict = { "bda": "gestion/bda/", "petitscours": "gestion/petitcours/", "events": "gestion/event_v2/", # the events module is still experimental ! - "authens": "gestion/authens/", + "authens": "gestion/auth/", } for (app_name, url_prefix) in app_dict.items(): if app_name in settings.INSTALLED_APPS: diff --git a/kfet/auth/tests.py b/kfet/auth/tests.py index 32e04812..01ceebe4 100644 --- a/kfet/auth/tests.py +++ b/kfet/auth/tests.py @@ -168,7 +168,9 @@ class GenericLoginViewTests(TestCase): r = self.client.post(self.url) self.assertRedirects( - r, "/gestion/logout?next={}".format(self.url), fetch_redirect_response=False + r, + "/gestion/auth/logout?next={}".format(self.url), + fetch_redirect_response=False, ) def test_notoken_not_team(self): @@ -180,13 +182,17 @@ class GenericLoginViewTests(TestCase): # With GET. r = self.client.get(self.url) self.assertRedirects( - r, "/gestion/login?next={}".format(self.url), fetch_redirect_response=False + r, + "/gestion/auth/login/choose?next={}".format(self.url), + fetch_redirect_response=False, ) # Also with POST. r = self.client.post(self.url) self.assertRedirects( - r, "/gestion/login?next={}".format(self.url), fetch_redirect_response=False + r, + "/gestion/auth/login/choose?next={}".format(self.url), + fetch_redirect_response=False, ) def _set_signed_cookie(self, client, key, value): diff --git a/kfet/tests/test_statistic.py b/kfet/tests/test_statistic.py index 6d8ecb47..1cd86743 100644 --- a/kfet/tests/test_statistic.py +++ b/kfet/tests/test_statistic.py @@ -61,7 +61,7 @@ class TestStats(TestCase): self.assertEqual(404, resp2.status_code) # 2. FOO is a member of the team and can get these pages but BAR - # receives a Redirect response + # receives a 403 response articles_urls = [ "/k-fet/articles/{}/stat/sales/list".format(article.pk), "/k-fet/articles/{}/stat/sales?{}".format( @@ -80,4 +80,4 @@ class TestStats(TestCase): resp = client.get(url) self.assertEqual(200, resp.status_code) resp2 = client2.get(url, follow=True) - self.assertRedirects(resp2, "/gestion/") + self.assertEqual(403, resp2.status_code) diff --git a/kfet/tests/test_views.py b/kfet/tests/test_views.py index 47382aa1..fcebef8c 100644 --- a/kfet/tests/test_views.py +++ b/kfet/tests/test_views.py @@ -232,7 +232,7 @@ class AccountReadViewTests(ViewTestCaseMixin, TestCase): response = client.get(url) self.assertRedirects( response, - "/gestion/login?next={}".format(url), + "/gestion/auth/login/choose?next={}".format(url), fetch_redirect_response=False, ) else: @@ -344,7 +344,7 @@ class AccountUpdateViewTests(ViewTestCaseMixin, TestCase): response = meth(url) self.assertRedirects( response, - "/gestion/login?next={}".format(url), + "/gestion/auth/login/choose?next={}".format(url), fetch_redirect_response=False, ) else: @@ -629,7 +629,7 @@ class AccountStatOperationListViewTests(ViewTestCaseMixin, TestCase): response = client.get(url) self.assertRedirects( response, - "/gestion/login?next={}".format(url), + "/gestion/auth/login/choose?next={}".format(url), fetch_redirect_response=False, ) else: @@ -723,7 +723,7 @@ class AccountStatOperationViewTests(ViewTestCaseMixin, TestCase): response = client.get(url) self.assertRedirects( response, - "/gestion/login?next={}".format(url), + "/gestion/auth/login/choose?next={}".format(url), fetch_redirect_response=False, ) else: @@ -764,7 +764,7 @@ class AccountStatBalanceListViewTests(ViewTestCaseMixin, TestCase): response = client.get(url) self.assertRedirects( response, - "/gestion/login?next={}".format(url), + "/gestion/auth/login/choose?next={}".format(url), fetch_redirect_response=False, ) else: @@ -830,7 +830,7 @@ class AccountStatBalanceViewTests(ViewTestCaseMixin, TestCase): response = client.get(url) self.assertRedirects( response, - "/gestion/login?next={}".format(url), + "/gestion/auth/login/choose?next={}".format(url), fetch_redirect_response=False, ) else: diff --git a/kfet/tests/testcases.py b/kfet/tests/testcases.py index 4912023e..a6781387 100644 --- a/kfet/tests/testcases.py +++ b/kfet/tests/testcases.py @@ -39,7 +39,9 @@ class TestCaseMixin: querystring = QueryDict(mutable=True) querystring["next"] = full_path - login_url = "/gestion/login?" + querystring.urlencode(safe="/") + login_url = "/gestion/auth/login/choose?{}".format( + querystring.urlencode(safe="/") + ) # We don't focus on what the login view does. # So don't fetch the redirect. diff --git a/shared/tests/mixins.py b/shared/tests/mixins.py index ea83616a..6f056d20 100644 --- a/shared/tests/mixins.py +++ b/shared/tests/mixins.py @@ -173,7 +173,7 @@ class TestCaseMixin: querystring["next"] = full_path login_url = "{}?{}".format( - reverse("cof-login"), querystring.urlencode(safe="/") + reverse("authens:login"), querystring.urlencode(safe="/") ) # We don't focus on what the login view does.