Skip to content

Commit

Permalink
Redirects are not checked now in absolute url
Browse files Browse the repository at this point in the history
  • Loading branch information
Fantomas42 committed Mar 8, 2016
1 parent ace49e8 commit 6da4d70
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions zinnia/tests/test_views.py
Expand Up @@ -318,7 +318,7 @@ def test_zinnia_entry_shortlink(self):
self.assertEqual(response.status_code, 301)
self.assertEqual(
response['Location'],
'http://testserver%s' % self.first_entry.get_absolute_url())
self.first_entry.get_absolute_url())

def test_zinnia_entry_shortlink_unpublished(self):
"""
Expand Down Expand Up @@ -596,8 +596,7 @@ def test_zinnia_entry_search(self):

def test_zinnia_entry_random(self):
response = self.client.get('/random/', follow=True)
self.assertTrue(response.redirect_chain[0][0].startswith(
'http://testserver/2010/'))
self.assertTrue(response.redirect_chain[0][0].startswith('/2010/'))
self.assertEqual(response.redirect_chain[0][1], 302)

def test_zinnia_sitemap(self):
Expand Down Expand Up @@ -706,25 +705,25 @@ def test_quick_entry(self):
self.assertEqual(response.status_code, 302)
self.assertEqual(
response['Location'],
'http://testserver/accounts/login/?next=/quick-entry/')
'/accounts/login/?next=/quick-entry/')
self.client.login(username='admin', password='password')
response = self.client.get('/quick-entry/')
self.assertEqual(response.status_code, 302)
self.assertEqual(
response['Location'],
'http://testserver/accounts/login/?next=/quick-entry/')
'/accounts/login/?next=/quick-entry/')
self.client.logout()
self.client.login(username='root', password='password')
response = self.client.get('/quick-entry/')
self.assertEqual(response.status_code, 302)
self.assertEqual(
response['Location'],
'http://testserver/admin/zinnia/entry/add/')
'/admin/zinnia/entry/add/')
response = self.client.post('/quick-entry/', {'content': 'test'})
self.assertEqual(response.status_code, 302)
self.assertTrue(urlEqual(
response['Location'],
'http://testserver/admin/zinnia/entry/add/'
'/admin/zinnia/entry/add/'
'?tags=&title=&sites=1&content='
'%3Cp%3Etest%3C%2Fp%3E&authors=2&slug='))
response = self.client.post('/quick-entry/',
Expand All @@ -735,7 +734,7 @@ def test_quick_entry(self):
self.assertEqual(response.status_code, 302)
self.assertEqual(
response['Location'],
'http://testserver%s' % entry.get_absolute_url())
entry.get_absolute_url())
self.assertEqual(entry.status, DRAFT)
self.assertEqual(entry.title, 'test')
self.assertEqual(entry.tags, 'test')
Expand All @@ -752,7 +751,7 @@ def test_quick_entry_non_ascii_title_issue_153(self):
self.assertEqual(response.status_code, 302)
self.assertTrue(urlEqual(
response['Location'],
'http://testserver/admin/zinnia/entry/add/'
'/admin/zinnia/entry/add/'
'?tags=test-2&title=%D1%82%D0%B5%D1%81%D1%82'
'&sites=1&content=%3Cp%3ETest+content%3C%2Fp%3E'
'&authors=2&slug='))
Expand All @@ -772,7 +771,7 @@ def test_quick_entry_markup_language_issue_270(self):
self.assertEqual(response.status_code, 302)
self.assertEqual(
response['Location'],
'http://testserver%s' % entry.get_absolute_url())
entry.get_absolute_url())
self.assertEqual(
entry.content,
'Hello *World* !')
Expand Down

0 comments on commit 6da4d70

Please sign in to comment.