Fix tests

This commit is contained in:
Skia
2016-08-02 22:20:06 +02:00
parent 7002139176
commit db712c86b8
4 changed files with 34 additions and 25 deletions

View File

@ -447,7 +447,10 @@ class Page(models.Model):
return '/'.join([self.parent.get_full_name(), self.name])
def get_display_name(self):
return self.revisions.last().title
try:
return self.revisions.last().title
except:
return self.name
class PageRev(models.Model):
"""

View File

@ -13,7 +13,7 @@
<p>{% trans %}Born: {% endtrans %}{{ profile.date_of_birth|date("d/m/Y") }}</p>
</div>
{% if user.membership.filter(end_date=None).exists() %}
{% if user.membership.filter(end_date=None).exists() or user.is_in_group(settings.SITH_MAIN_BOARD_GROUP) %}
{# if the user is member of a club, he can view the subscription state #}
<p>
{% if get_subscriber(profile).is_subscribed() %}

View File

@ -161,7 +161,7 @@ class UserRegistrationTest(TestCase):
})
response = c.post(reverse('core:login'), {'username': 'gcarlier', 'password': 'guy'})
self.assertTrue(response.status_code == 200)
self.assertTrue('Please try again' in str(response.content))
self.assertTrue('<ul class="errorlist nonfield">' in str(response.content))
class PageHandlingTest(TestCase):
def setUp(self):
@ -188,7 +188,7 @@ class PageHandlingTest(TestCase):
})
response = self.client.get(reverse('core:page', kwargs={'page_name': 'guy'}))
self.assertTrue(response.status_code == 200)
self.assertTrue("<strong>guy</strong>" in str(response.content))
self.assertTrue('<a href="/page/guy/hist">' in str(response.content))
def test_create_child_page_ok(self):
"""
@ -206,7 +206,7 @@ class PageHandlingTest(TestCase):
})
response = self.client.get(reverse('core:page', kwargs={'page_name': 'guy/bibou'}))
self.assertTrue(response.status_code == 200)
self.assertTrue("<strong>guy/bibou</strong>" in str(response.content))
self.assertTrue('<a href="/page/guy/bibou/">' in str(response.content))
def test_access_child_page_ok(self):
"""
@ -227,7 +227,6 @@ class PageHandlingTest(TestCase):
})
response = self.client.get(reverse('core:page', kwargs={'page_name': 'guy/bibou'}))
self.assertTrue(response.status_code == 200)
#self.assertTrue('PAGE_FOUND : Bibou' in str(response.content))
def test_access_page_not_found(self):
"""
@ -235,7 +234,7 @@ class PageHandlingTest(TestCase):
"""
response = self.client.get(reverse('core:page', kwargs={'page_name': 'swagg'}))
self.assertTrue(response.status_code == 200)
self.assertTrue('<a href="/page/create?page=swagg">Create it?</a>' in str(response.content))
self.assertTrue('<a href="/page/create?page=swagg">' in str(response.content))
def test_create_page_markdown_safe(self):
"""