Skip to content

Commit

Permalink
Refactor methods into superclass.
Browse files Browse the repository at this point in the history
  • Loading branch information
qris committed Jun 13, 2012
1 parent 6a01fa9 commit c89841f
Showing 1 changed file with 2 additions and 44 deletions.
46 changes: 2 additions & 44 deletions tests.py
Expand Up @@ -56,28 +56,7 @@ def test_create_document_object(self):
def test_document_admin_class(self):
self.assertIn(Document, admin.site._registry)
self.assertIsInstance(admin.site._registry[Document], DocumentAdmin)
self.assertEqual(1, )

def extract_error_message(self, response):
error_message = response.parsed.findtext('.//div[@class="error-message"]')

if error_message is None:
error_message = response.parsed.findtext('.//p[@class="errornote"]')

if error_message is not None:
# extract individual field errors, if any
more_error_messages = response.parsed.findtext('.//td[@class="errors-cell"]')
if more_error_messages is not None:
error_message += more_error_messages

# trim and canonicalise whitespace
error_message = error_message.strip()
import re
error_message = re.sub('\\s+', ' ', error_message)

# return message or None
return error_message


def create_document_by_post(self, **kwargs):
f = StringIO('foobar')
setattr(f, 'name', 'boink.png')
Expand Down Expand Up @@ -108,27 +87,6 @@ def assert_create_document_by_post(self, **kwargs):
self.assert_changelist_not_admin_form_with_errors(response)
return response

def assert_changelist_not_admin_form_with_errors(self, response):
self.assertTrue(hasattr(response, 'context'), "Missing context " +
"in response: %s: %s" % (response, dir(response)))
self.assertIsNotNone(response.context, "Empty context in response: " +
"%s: %s" % (response, dir(response)))

if 'adminform' in response.context:
self.assertDictEqual({}, response.context['adminform'].form.errors)
for fieldset in response.context['adminform']:
for line in fieldset:
self.assertIsNone(line.errors)
for field in line:
self.assertIsNone(field.errors)
self.assertIsNone(response.context['adminform'].form.non_field_errors)
self.assertIsNone(self.extract_error_message(response))

self.assertNotIn('adminform', response.context, "Unexpected " +
"admin form in response context: %s" % response)
self.assertIn('cl', response.context, "Missing changelist " +
"in response context: %s" % response)

def test_create_document_admin(self):
response = self.client.get(reverse('admin:documents_document_add'))
self.assertEqual(response.status_code, 200)
Expand Down Expand Up @@ -550,7 +508,7 @@ def test_document_download_link_shown_on_readonly_form(self):
field_name = field.field['field']
self.assertEqual('file', field_name)

from binder.admin import AdminFileWidgetWithSize
from binder.widgets import AdminFileWidgetWithSize
self.assertIsInstance(field.form[field_name].field.widget,
AdminFileWidgetWithSize)

Expand Down

0 comments on commit c89841f

Please sign in to comment.