matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow multitle expected_content_types in tests

Browse Source 
Some tests return 'text/html' or 'text/html; charset=utf-8'
which are essentially the same if they are tested in debug mode.

Signed-off-by: Roberto Rosario <roberto.rosario@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2019-11-11 02:20:58 -04:00
parent 6bd672a756
commit b0677a8bda
9 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mayan/apps/common/tests/mixins.py
View File

@@ -116,7 +116,7 @@ class ConnectionsCheckTestCaseMixin(object):
class ContentTypeCheckTestCaseMixin(object):
expected_content_type = 'text/html; charset=utf-8'
expected_content_types = ('text/html', 'text/html; charset=utf-8')
def _pre_setup(self):
super(ContentTypeCheckTestCaseMixin, self)._pre_setup()
@@ -127,11 +127,11 @@ class ContentTypeCheckTestCaseMixin(object):
response = super(CustomClient, self).request(*args, **kwargs)
content_type = response._headers.get('content-type', [None, ''])[1]
if test_instance.expected_content_type:
test_instance.assertEqual(
content_type, test_instance.expected_content_type,
if test_instance.expected_content_types:
test_instance.assertTrue(
content_type in test_instance.expected_content_types,
msg='Unexpected response content type: {}, expected: {}.'.format(
content_type, test_instance.expected_content_type
content_type, ' or '.join(test_instance.expected_content_types)
)
)