From 77aab85a426326d726e285690208d80079a08e36 Mon Sep 17 00:00:00 2001 From: Michael Olund Date: Mon, 28 Sep 2020 18:10:29 -0700 Subject: [PATCH] Fixed broken test --- edivorce/apps/core/tests/test_logic.py | 33 ++++++++++++-------------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/edivorce/apps/core/tests/test_logic.py b/edivorce/apps/core/tests/test_logic.py index f40c7186..94dc2b37 100644 --- a/edivorce/apps/core/tests/test_logic.py +++ b/edivorce/apps/core/tests/test_logic.py @@ -5,7 +5,7 @@ from django.test import TestCase from edivorce.apps.core.models import BceidUser, UserResponse from edivorce.apps.core.utils.conditional_logic import get_cleaned_response_value, get_num_children_living_with from edivorce.apps.core.utils.user_response import get_data_for_user -from edivorce.apps.core.views.api import _content_type_from_filename +from edivorce.apps.core.models import Document class ConditionalLogicTestCase(TestCase): @@ -56,20 +56,17 @@ class ConditionalLogicTestCase(TestCase): class ViewLogic(TestCase): def test_content_type_from_filename(self): - self.assertEqual(_content_type_from_filename('test_file1.pdf'), 'application/pdf') - self.assertEqual(_content_type_from_filename('redis_key_test_file1_pdf'), 'application/pdf') - self.assertEqual(_content_type_from_filename('test_file2.png'), 'image/png') - self.assertEqual(_content_type_from_filename('redis_key_test_file2_png'), 'image/png') - self.assertEqual(_content_type_from_filename('Test File 3.GIF'), 'image/gif') - self.assertEqual(_content_type_from_filename('redis_key_test_file_3_GIF'), 'image/gif') - self.assertEqual(_content_type_from_filename('Test_File--4.JPEG'), 'image/jpeg') - self.assertEqual(_content_type_from_filename('redis_key_test_file_4_jpeg'), 'image/jpeg') - self.assertEqual(_content_type_from_filename('TestFile5.jpe'), 'image/jpeg') - self.assertEqual(_content_type_from_filename('redis_key_test_file_5_jpe'), 'image/jpeg') - self.assertEqual(_content_type_from_filename('testFile6.jpeg'), 'image/jpeg') - self.assertEqual(_content_type_from_filename('redis_key_testfile_6_jpeg'), 'image/jpeg') - - with self.assertRaises(TypeError): - _content_type_from_filename('test_file7.HEIC') - with self.assertRaises(TypeError): - _content_type_from_filename('redis_key_testfile_7_svg') + self.assertEqual(Document.content_type_from_filename('test_file1.pdf'), 'application/pdf') + self.assertEqual(Document.content_type_from_filename('redis_key_test_file1_pdf'), 'application/pdf') + self.assertEqual(Document.content_type_from_filename('test_file2.png'), 'image/png') + self.assertEqual(Document.content_type_from_filename('redis_key_test_file2_png'), 'image/png') + self.assertEqual(Document.content_type_from_filename('Test File 3.GIF'), 'image/gif') + self.assertEqual(Document.content_type_from_filename('redis_key_test_file_3_GIF'), 'image/gif') + self.assertEqual(Document.content_type_from_filename('Test_File--4.JPEG'), 'image/jpeg') + self.assertEqual(Document.content_type_from_filename('redis_key_test_file_4_jpeg'), 'image/jpeg') + self.assertEqual(Document.content_type_from_filename('TestFile5.jpe'), 'image/jpeg') + self.assertEqual(Document.content_type_from_filename('redis_key_test_file_5_jpe'), 'image/jpeg') + self.assertEqual(Document.content_type_from_filename('testFile6.jpeg'), 'image/jpeg') + self.assertEqual(Document.content_type_from_filename('redis_key_testfile_6_jpeg'), 'image/jpeg') + self.assertEqual(Document.content_type_from_filename('test_file7.HEIC'), 'application/unknown') + self.assertEqual(Document.content_type_from_filename('redis_key_testfile_7_svgg'), 'application/unknown')