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

Hopefully fix intermittent test failures

Browse source 
Something was polluting the edit handlers with rich text fields that
then failed somewhere else due to missing configs. I'm not sure exactly
where and what the leakage was, but the test now pass consistently for
me so hopefully this fixed it? 🤷
This commit is contained in:
Tim Heap 2016-10-27 14:31:24 +11:00 committed by Matt Westcott
parent 46724f6954
commit 839db55abe
2 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
wagtail/wagtailadmin/tests/test_edit_handlers.py
View file

@ -115,10 +115,11 @@ def clear_edit_handler(page_cls):
def decorated(self):
# Clear any old EditHandlers generated
page_cls.get_edit_handler.cache_clear()
fn(self)
# Clear the bad EditHandler generated just now
page_cls.get_edit_handler.cache_clear()
return decorated
try:
fn(self)
finally:
# Clear the bad EditHandler generated just now
page_cls.get_edit_handler.cache_clear()
return decorator

73
wagtail/wagtailadmin/tests/test_rich_text.py
View file

@ -8,7 +8,34 @@ from django.test.utils import override_settings
from wagtail.tests.testapp.rich_text import CustomRichTextArea
from wagtail.tests.utils import WagtailTestUtils
from wagtail.wagtailadmin.rich_text import HalloRichTextArea, get_rich_text_editor_widget
from wagtail.wagtailcore.models import Page
from wagtail.wagtailcore.models import Page, get_page_models
class BaseRichTextEditHandlerTestCase(TestCase):
def _clear_edit_handler_cache(self):
"""
These tests generate new EditHandlers with different settings. The
cached edit handlers should be cleared before and after each test run
to ensure that no changes leak through to other tests.
"""
from wagtail.tests.testapp.models import DefaultRichBlockFieldPage
block_page_edit_handler = DefaultRichBlockFieldPage.get_edit_handler()
if block_page_edit_handler._form_class:
rich_text_block = block_page_edit_handler._form_class.base_fields['body'].block.child_blocks['rich_text']
if hasattr(rich_text_block, 'field'):
del rich_text_block.field
for page_class in get_page_models():
page_class.get_edit_handler.cache_clear()
def setUp(self):
super(BaseRichTextEditHandlerTestCase, self).setUp()
self._clear_edit_handler_cache()
def tearDown(self):
self._clear_edit_handler_cache()
super(BaseRichTextEditHandlerTestCase, self).tearDown()
class TestGetRichTextEditorWidget(TestCase):
@ -50,9 +77,10 @@ class TestGetRichTextEditorWidget(TestCase):
@override_settings()
class TestDefaultRichText(TestCase, WagtailTestUtils):
class TestDefaultRichText(BaseRichTextEditHandlerTestCase, WagtailTestUtils):
def setUp(self):
super(TestDefaultRichText, self).setUp()
# Find root page
self.root_page = Page.objects.get(id=2)
@ -62,19 +90,6 @@ class TestDefaultRichText(TestCase, WagtailTestUtils):
if hasattr(settings, 'WAGTAILADMIN_RICH_TEXT_EDITORS'):
del settings.WAGTAILADMIN_RICH_TEXT_EDITORS
def tearDown(self):
from wagtail.tests.testapp.models import DefaultRichBlockFieldPage
from wagtail.tests.testapp.models import DefaultRichTextFieldPage
DefaultRichTextFieldPage.get_edit_handler()._form_class = None
block_page_edit_handler = DefaultRichBlockFieldPage.get_edit_handler()
if block_page_edit_handler._form_class:
rich_text_block = block_page_edit_handler._form_class.base_fields['body'].block.child_blocks['rich_text']
if hasattr(rich_text_block, 'field'):
del rich_text_block.field
block_page_edit_handler._form_class = None
def test_default_editor_in_rich_text_field(self):
response = self.client.get(reverse(
'wagtailadmin_pages:add', args=('tests', 'defaultrichtextfieldpage', self.root_page.id)
@ -103,27 +118,16 @@ class TestDefaultRichText(TestCase, WagtailTestUtils):
'WIDGET': 'wagtail.tests.testapp.rich_text.CustomRichTextArea'
},
})
class TestOverriddenDefaultRichText(TestCase, WagtailTestUtils):
class TestOverriddenDefaultRichText(BaseRichTextEditHandlerTestCase, WagtailTestUtils):
def setUp(self):
super(TestOverriddenDefaultRichText, self).setUp()
# Find root page
self.root_page = Page.objects.get(id=2)
self.login()
def tearDown(self):
from wagtail.tests.testapp.models import DefaultRichBlockFieldPage
from wagtail.tests.testapp.models import DefaultRichTextFieldPage
DefaultRichTextFieldPage.get_edit_handler()._form_class = None
block_page_edit_handler = DefaultRichBlockFieldPage.get_edit_handler()
if block_page_edit_handler._form_class:
rich_text_block = block_page_edit_handler._form_class.base_fields['body'].block.child_blocks['rich_text']
if hasattr(rich_text_block, 'field'):
del rich_text_block.field
block_page_edit_handler._form_class = None
def test_overridden_default_editor_in_rich_text_field(self):
response = self.client.get(reverse(
'wagtailadmin_pages:add', args=('tests', 'defaultrichtextfieldpage', self.root_page.id)
@ -157,21 +161,16 @@ class TestOverriddenDefaultRichText(TestCase, WagtailTestUtils):
'WIDGET': 'wagtail.tests.testapp.rich_text.CustomRichTextArea'
},
})
class TestCustomDefaultRichText(TestCase, WagtailTestUtils):
class TestCustomDefaultRichText(BaseRichTextEditHandlerTestCase, WagtailTestUtils):
def setUp(self):
super(TestCustomDefaultRichText, self).setUp()
# Find root page
self.root_page = Page.objects.get(id=2)
self.login()
def tearDown(self):
from wagtail.tests.testapp.models import CustomRichBlockFieldPage
from wagtail.tests.testapp.models import CustomRichTextFieldPage
CustomRichBlockFieldPage.get_edit_handler()._form_class = None
CustomRichTextFieldPage.get_edit_handler()._form_class = None
def test_custom_editor_in_rich_text_field(self):
response = self.client.get(reverse(
'wagtailadmin_pages:add', args=('tests', 'customrichtextfieldpage', self.root_page.id)