From 73f2be72ce4e91abcb31fae8c625ca6ba9ba6b70 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Fri, 18 Jun 2021 09:32:52 +0200
Subject: [PATCH] Fix url in tests

---
 server/oauth/tests/test_login.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/server/oauth/tests/test_login.py b/server/oauth/tests/test_login.py
index f2af0775..21bdd79d 100644
--- a/server/oauth/tests/test_login.py
+++ b/server/oauth/tests/test_login.py
@@ -12,7 +12,7 @@ from django.utils import timezone
 from core.factories import UserFactory
 from oauth.hep_client import HepClient
 from oauth.user_signup_login_handler import EMAIL_NOT_VERIFIED, NO_VALID_LICENSE, UNKNOWN_ERROR
-from oauth.views import authorize
+from oauth.views import authorize, OAUTH_REDIRECT
 from users.tests.mock_hep_data_factory import MockResponse, ME_DATA, VALID_STUDENT_ORDERS, VALID_TEACHERS_ORDERS
 from users.factories import LicenseFactory
 from users.models import Role, User, SchoolClass, License, UserData
@@ -68,7 +68,7 @@ class LoginTests(TestCase):
         user = User.objects.get(hep_id=self.user.hep_id)
 
         self.assertEqual(response.status_code, 302)
-        self.assertEqual(response.url, '/login-success?state=success')
+        self.assertEqual(response.url, f'/{OAUTH_REDIRECT}?state=success')
         self.assertEqual(user.username, ME_DATA['email'])
         self.assertEqual(user.email, ME_DATA['email'])
         self.assertTrue(self.user.is_authenticated)
@@ -91,7 +91,7 @@ class LoginTests(TestCase):
         self.assertIsNotNone(school_class)
 
         self.assertEqual(response.status_code, 302)
-        self.assertEqual(response.url, '/login-success?state=success')
+        self.assertEqual(response.url, f'/{OAUTH_REDIRECT}?state=success')
         self.assertTrue(self.user.is_authenticated)
 
         try:
@@ -115,7 +115,7 @@ class LoginTests(TestCase):
         self.assertEqual(license.for_role.key, Role.objects.STUDENT_KEY)
 
         self.assertEqual(response.status_code, 302)
-        self.assertEqual(response.url, '/login-success?state=success')
+        self.assertEqual(response.url, f'/{OAUTH_REDIRECT}?state=success')
         self.assertTrue(self.user.is_authenticated)
 
     @patch.object(HepClient, 'is_email_verified', return_value=False)
@@ -126,7 +126,7 @@ class LoginTests(TestCase):
 
         User.objects.get(email=ME_DATA['email'])
         self.assertEqual(302, response.status_code)
-        self.assertEqual(f'/login-success?state={EMAIL_NOT_VERIFIED}', response.url)
+        self.assertEqual(f'/{OAUTH_REDIRECT}?state={EMAIL_NOT_VERIFIED}', response.url)
 
     @patch.object(HepClient, 'fetch_eorders', return_value=[])
     @patch.object(DjangoRemoteApp, 'authorize_access_token', return_value=TOKEN)
@@ -135,7 +135,7 @@ class LoginTests(TestCase):
         response = self._login('/api/oauth/authorize?code=1234')
 
         self.assertEqual(response.status_code, 302)
-        self.assertEqual(response.url, f'/login-success?state={NO_VALID_LICENSE}')
+        self.assertEqual(response.url, f'/{OAUTH_REDIRECT}?state={NO_VALID_LICENSE}')
         self.assertTrue(self.user.is_authenticated)
 
     @patch.object(HepClient, 'fetch_eorders', return_value=[])
@@ -149,7 +149,7 @@ class LoginTests(TestCase):
         response = self._login('/api/oauth/authorize?code=1234')
 
         self.assertEqual(response.status_code, 302)
-        self.assertEqual(response.url, f'/login-success?state={NO_VALID_LICENSE}')
+        self.assertEqual(response.url, f'/{OAUTH_REDIRECT}?state={NO_VALID_LICENSE}')
         self.assertTrue(self.user.is_authenticated)
 
     @patch.object(requests, 'get', return_value=MockResponse(500))
@@ -157,7 +157,7 @@ class LoginTests(TestCase):
         response = self._login('/api/oauth/authorize?code=1234')
 
         self.assertEqual(response.status_code, 302)
-        self.assertEqual(response.url, f'/login-success?state={UNKNOWN_ERROR}')
+        self.assertEqual(response.url, f'/{OAUTH_REDIRECT}?state={UNKNOWN_ERROR}')
 
     @patch.object(HepClient, 'fetch_eorders', return_value=VALID_TEACHERS_ORDERS)
     @patch.object(DjangoRemoteApp, 'authorize_access_token', return_value=TOKEN)
@@ -180,7 +180,7 @@ class LoginTests(TestCase):
         self.assertIsNotNone(school_class)
 
         self.assertEqual(response.status_code, 302)
-        self.assertEqual(response.url, '/login-success?state=success')
+        self.assertEqual(response.url, f'/{OAUTH_REDIRECT}?state=success')
         self.assertTrue(self.user.is_authenticated)
 
         try:
@@ -210,7 +210,7 @@ class LoginTests(TestCase):
         self.assertIsNotNone(school_class)
 
         self.assertEqual(response.status_code, 302)
-        self.assertEqual(response.url, f'/login-success?state={NO_VALID_LICENSE}')
+        self.assertEqual(response.url, f'/{OAUTH_REDIRECT}?state={NO_VALID_LICENSE}')
         self.assertTrue(self.user.is_authenticated)
 
         try: