diff --git a/tests/seahub/auth/views/test_login.py b/tests/seahub/auth/views/test_login.py index ee16232a7c..381fcef502 100644 --- a/tests/seahub/auth/views/test_login.py +++ b/tests/seahub/auth/views/test_login.py @@ -22,7 +22,7 @@ class LoginTest(BaseTestCase): ) self.assertEqual(302, resp.status_code) - self.assertRegexpMatches(resp['Location'], r'http://testserver%s' % settings.LOGIN_REDIRECT_URL) + self.assertRegexpMatches(resp['Location'], settings.LOGIN_REDIRECT_URL) def test_can_login_with_login_id(self): p = Profile.objects.add_or_update(self.user.username, 'nickname') @@ -36,7 +36,7 @@ class LoginTest(BaseTestCase): 'password': self.user_password} ) self.assertEqual(302, resp.status_code) - self.assertRegexpMatches(resp['Location'], r'http://testserver%s' % settings.LOGIN_REDIRECT_URL) + self.assertRegexpMatches(resp['Location'], settings.LOGIN_REDIRECT_URL) def test_redirect_to_after_success_login(self): resp = self.client.post( @@ -46,7 +46,7 @@ class LoginTest(BaseTestCase): ) self.assertEqual(302, resp.status_code) - self.assertRegexpMatches(resp['Location'], r'http://testserver/foo/') + self.assertRegexpMatches(resp['Location'], r'/foo/') def test_bad_redirect_to_after_success_login(self): from django.utils.http import urlquote @@ -57,7 +57,7 @@ class LoginTest(BaseTestCase): ) self.assertEqual(302, resp.status_code) - self.assertRegexpMatches(resp['Location'], r'http://testserver%s' % settings.LOGIN_REDIRECT_URL) + self.assertRegexpMatches(resp['Location'], settings.LOGIN_REDIRECT_URL) def test_bad_redirect2_to_after_success_login(self): from django.utils.http import urlquote @@ -68,7 +68,7 @@ class LoginTest(BaseTestCase): ) self.assertEqual(302, resp.status_code) - self.assertRegexpMatches(resp['Location'], r'http://testserver%s' % settings.LOGIN_REDIRECT_URL) + self.assertRegexpMatches(resp['Location'], settings.LOGIN_REDIRECT_URL) def test_redirect_to_other_host_after_success_login(self): from django.utils.http import urlquote @@ -79,7 +79,7 @@ class LoginTest(BaseTestCase): ) self.assertEqual(302, resp.status_code) - self.assertRegexpMatches(resp['Location'], r'http://testserver%s' % settings.LOGIN_REDIRECT_URL) + self.assertRegexpMatches(resp['Location'], settings.LOGIN_REDIRECT_URL) def test_force_passwd_change_when_login(self): UserOptions.objects.set_force_passwd_change(self.user.username) diff --git a/tests/seahub/profile/views/test_edit_profile.py b/tests/seahub/profile/views/test_edit_profile.py index a454c1193f..954c9f0022 100644 --- a/tests/seahub/profile/views/test_edit_profile.py +++ b/tests/seahub/profile/views/test_edit_profile.py @@ -29,5 +29,5 @@ class EditProfileTest(BaseTestCase): 'nickname': 'new nickname' }) self.assertEqual(302, resp.status_code) - self.assertRegexpMatches(resp['Location'], r'http://testserver/profile/') + self.assertRegexpMatches(resp['Location'], r'/profile/') assert email2nickname(self.tmp_user.username) == 'new nickname' diff --git a/tests/seahub/two_factor/views/test_backup_tokens_view.py b/tests/seahub/two_factor/views/test_backup_tokens_view.py index ae6f3288e9..0e33a16f80 100644 --- a/tests/seahub/two_factor/views/test_backup_tokens_view.py +++ b/tests/seahub/two_factor/views/test_backup_tokens_view.py @@ -25,4 +25,4 @@ class BackupTokensViewTest(BaseTestCase): resp = self.client.get(self.url) # redirect to 2fa setup page self.assertRegexpMatches(resp['Location'], - r'http://testserver/profile/two_factor_authentication/setup/') + r'/profile/two_factor_authentication/setup/') diff --git a/tests/seahub/views/test_sso.py b/tests/seahub/views/test_sso.py index eae19938a1..81da55bfd8 100644 --- a/tests/seahub/views/test_sso.py +++ b/tests/seahub/views/test_sso.py @@ -15,10 +15,10 @@ class SSOTest(BaseTestCase): def test_sso(self): resp = self.client.get(self.url) self.assertEqual(302, resp.status_code) - assert resp.get('location') == 'http://testserver/' + assert resp.get('location') == '/' resp = self.client.get(self.url + '?next=/foo') - assert resp.get('location') == 'http://testserver/foo' + assert resp.get('location') == '/foo' resp = self.client.get(self.url + '?next=' + urlquote('http://testserver\@example.com')) - self.assertRegexpMatches(resp['Location'], r'http://testserver%s' % settings.LOGIN_REDIRECT_URL) + self.assertRegexpMatches(resp['Location'], settings.LOGIN_REDIRECT_URL)