Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-11 00:33:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix unit test failures

Browse source
This commit is contained in:
Tom Talbot 2014-07-14 11:23:36 +01:00
parent edf10d4c6f
commit 1aefd60bd6
4 changed files with 29 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py
View file

@ -128,7 +128,7 @@ def hook_output(hook_name):
def usage_count_enabled():
if hasattr(
settings, 'WAGTAIL_USAGE_COUNT_ENABLED'
) or settings.WAGTAIL_USAGE_COUNT_ENABLED:
) and settings.WAGTAIL_USAGE_COUNT_ENABLED:
return True
else:
return False

33
wagtail/wagtaildocs/tests.py
View file

@ -9,6 +9,7 @@ from django.test.utils import override_settings
from wagtail.wagtaildocs import models
from wagtail.tests.utils import WagtailTestUtils
from wagtail.wagtailcore.models import Page
from wagtail.tests.models import EventPage, EventPageRelatedLink
from wagtail.wagtaildocs.models import Document
@ -325,16 +326,12 @@ class TestUsageCount(TestCase, WagtailTestUtils):
def setUp(self):
self.login()
def test_document_usage_count_not_enabled(self):
doc = Document.objects.get(id=1)
self.assertEqual(doc.usage_count, None)
@override_settings(USAGE_COUNT=True)
@override_settings(WAGTAIL_USAGE_COUNT_ENABLED=True)
def test_unused_document_usage_count(self):
doc = Document.objects.get(id=1)
self.assertEqual(doc.usage_count, 0)
self.assertEqual(doc.used_by.count(), 0)
@override_settings(USAGE_COUNT=True)
@override_settings(WAGTAIL_USAGE_COUNT_ENABLED=True)
def test_used_document_usage_count(self):
doc = Document.objects.get(id=1)
page = EventPage.objects.get(id=4)
@ -342,7 +339,7 @@ class TestUsageCount(TestCase, WagtailTestUtils):
event_page_related_link.page = page
event_page_related_link.link_document = doc
event_page_related_link.save()
self.assertEqual(doc.usage_count, 1)
self.assertEqual(doc.used_by.count(), 1)
def test_usage_count_does_not_appear(self):
doc = Document.objects.get(id=1)
@ -355,7 +352,7 @@ class TestUsageCount(TestCase, WagtailTestUtils):
args=(1,)))
self.assertNotContains(response, 'Used 1 Time')
@override_settings(USAGE_COUNT=True)
@override_settings(WAGTAIL_USAGE_COUNT_ENABLED=True)
def test_usage_count_appears(self):
doc = Document.objects.get(id=1)
page = EventPage.objects.get(id=4)
@ -367,7 +364,7 @@ class TestUsageCount(TestCase, WagtailTestUtils):
args=(1,)))
self.assertContains(response, 'Used 1 Time')
@override_settings(USAGE_COUNT=True)
@override_settings(WAGTAIL_USAGE_COUNT_ENABLED=True)
def test_usage_count_zero_appears(self):
response = self.client.get(reverse('wagtaildocs_edit_document',
args=(1,)))
@ -382,14 +379,14 @@ class TestUsedBy(TestCase, WagtailTestUtils):
def test_document_used_by_not_enabled(self):
doc = Document.objects.get(id=1)
self.assertEqual(doc.used_by, [])
self.assertEqual(list(doc.used_by), [])
@override_settings(USAGE_COUNT=True)
@override_settings(WAGTAIL_USAGE_COUNT_ENABLED=True)
def test_unused_document_used_by(self):
doc = Document.objects.get(id=1)
self.assertEqual(doc.used_by, [])
self.assertEqual(list(doc.used_by), [])
@override_settings(USAGE_COUNT=True)
@override_settings(WAGTAIL_USAGE_COUNT_ENABLED=True)
def test_used_document_used_by(self):
doc = Document.objects.get(id=1)
page = EventPage.objects.get(id=4)
@ -397,9 +394,9 @@ class TestUsedBy(TestCase, WagtailTestUtils):
event_page_related_link.page = page
event_page_related_link.link_document = doc
event_page_related_link.save()
self.assertEqual(doc.used_by, [page])
self.assertTrue(issubclass(Page, type(doc.used_by[0])))
@override_settings(USAGE_COUNT=True)
@override_settings(WAGTAIL_USAGE_COUNT_ENABLED=True)
def test_usage_page(self):
doc = Document.objects.get(id=1)
page = EventPage.objects.get(id=4)
@ -411,9 +408,9 @@ class TestUsedBy(TestCase, WagtailTestUtils):
args=(1,)))
self.assertContains(response, 'Christmas')
@override_settings(USAGE_COUNT=True)
@override_settings(WAGTAIL_USAGE_COUNT_ENABLED=True)
def test_usage_page_no_usage(self):
response = self.client.get(reverse('wagtaildocs_document_usage',
args=(1,)))
# There's no usage so there should be no table rows
self.assertRegex(response.content, '<tbody>(\s|\n)*</tbody>')
self.assertRegex(str(response.content), '<tbody>(\s|\n)*</tbody>')

22
wagtail/wagtailimages/tests.py
View file

@ -19,6 +19,7 @@ from wagtail.wagtailimages.formats import (
from wagtail.wagtailimages.backends import get_image_backend
from wagtail.wagtailimages.backends.pillow import PillowBackend
from wagtail.tests.models import EventPage, EventPageCarouselItem
from wagtail.wagtailcore.models import Page
def get_test_image_file():
@ -484,21 +485,18 @@ class TestUsageCount(TestCase):
file=get_test_image_file(),
)
def test_image_usage_count_not_enabled(self):
self.assertEqual(self.image.usage_count, None)
@override_settings(USAGE_COUNT=True)
@override_settings(WAGTAIL_USAGE_COUNT_ENABLED=True)
def test_unused_image_usage_count(self):
self.assertEqual(self.image.usage_count, 0)
self.assertEqual(self.image.used_by.count(), 0)
@override_settings(USAGE_COUNT=True)
@override_settings(WAGTAIL_USAGE_COUNT_ENABLED=True)
def test_used_image_document_usage_count(self):
page = EventPage.objects.get(id=4)
event_page_carousel_item = EventPageCarouselItem()
event_page_carousel_item.page = page
event_page_carousel_item.image = self.image
event_page_carousel_item.save()
self.assertEqual(self.image.usage_count, 1)
self.assertEqual(self.image.used_by.count(), 1)
class TestUsedBy(TestCase):
@ -511,17 +509,17 @@ class TestUsedBy(TestCase):
)
def test_image_used_by_not_enabled(self):
self.assertEqual(self.image.used_by, [])
self.assertEqual(list(self.image.used_by), [])
@override_settings(USAGE_COUNT=True)
@override_settings(WAGTAIL_USAGE_COUNT_ENABLED=True)
def test_unused_image_used_by(self):
self.assertEqual(self.image.used_by, [])
self.assertEqual(list(self.image.used_by), [])
@override_settings(USAGE_COUNT=True)
@override_settings(WAGTAIL_USAGE_COUNT_ENABLED=True)
def test_used_image_document_used_by(self):
page = EventPage.objects.get(id=4)
event_page_carousel_item = EventPageCarouselItem()
event_page_carousel_item.page = page
event_page_carousel_item.image = self.image
event_page_carousel_item.save()
self.assertEqual(self.image.used_by, [page])
self.assertTrue(issubclass(Page, type(self.image.used_by[0])))

14
wagtail/wagtailsnippets/tests.py
View file

@ -192,24 +192,16 @@ class TestSnippetOrdering(TestCase):
class TestUsageCount(TestCase):
fixtures = ['wagtail/tests/fixtures/test.json']
def test_snippet_usage_count_not_enabled(self):
advert = Advert.objects.get(id=1)
self.assertEqual(advert.usage_count(), None)
@override_settings(USAGE_COUNT=True)
@override_settings(WAGTAIL_USAGE_COUNT_ENABLED=True)
def test_snippet_usage_count(self):
advert = Advert.objects.get(id=1)
self.assertEqual(advert.usage_count(), 1)
self.assertEqual(advert.used_by().count(), 1)
class TestUsedBy(TestCase):
fixtures = ['wagtail/tests/fixtures/test.json']
def test_snippet_used_by_not_enabled(self):
advert = Advert.objects.get(id=1)
self.assertEqual(advert.used_by(), [])
@override_settings(USAGE_COUNT=True)
@override_settings(WAGTAIL_USAGE_COUNT_ENABLED=True)
def test_snippet_used_by(self):
advert = Advert.objects.get(id=1)
self.assertEqual(type(advert.used_by()[0]), Page)