Merge pull request #8 from Som-Energia/REMOVE_prettify

Remove prettify after changing editor to TinyMCE

tests/test_edits.py

@@ -46,7 +46,7 @@ async def test_save_user_edit_by_type(self, test_app):
         result = await save_user_edit(template_id=1, user_id=1, edit=edit)
         assert result
         current_edit = await get_edit_orm(1)
-        assert current_edit.body_text == 'New text\n\n'
+        assert current_edit.body_text == 'New text\n'
         assert current_edit.headers == "{'def_subject':'new_subject'}"
 
     async def test_delete_user_edit(self, test_app):

tests/test_schemas.py

@@ -24,17 +24,16 @@ def test__xml_id_validator__ok(valid_xml_id):
 
 PYTHON_PART = ('python', '<%\nfor a in [1,2]:\n\tprint(a)\n%>')
 PYTHON_INLINE = ('python', ' % if a:')
-HTML_PART =('html', '<p>text</p><p><b>Bold text</b></p>')
-PRETTY_HTML = '<p>\n text\n</p>\n<p>\n <b>\n  Bold text\n </b>\n</p>\n'
+HTML_PART =('html', '<p>\n text\n</p>\n<p>\n <b>\n  Bold text\n </b>\n</p>\n')
 @pytest.mark.parametrize(
     "input,expected", [ pytest.param(*x[1:], id=x[0]) for x in [
     ('empty', [], "full text"),
-    ('python', [PYTHON_PART], PYTHON_PART[1]+'\n'),
-    ('html', [HTML_PART], PRETTY_HTML),
-    ('python_html',[PYTHON_PART, HTML_PART], PYTHON_PART[1]+'\n' + PRETTY_HTML),
+    ('python', [PYTHON_PART], PYTHON_PART[1] + '\n'),
+    ('html', [HTML_PART], HTML_PART[1] + '\n'),
+    ('python_html',[PYTHON_PART, HTML_PART], PYTHON_PART[1] + '\n' + HTML_PART[1] + '\n'),
     ('python_html_inline_python',
         [PYTHON_PART, HTML_PART, PYTHON_INLINE, HTML_PART],
-        PYTHON_PART[1] + '\n' + PRETTY_HTML + PYTHON_INLINE[1] + '\n' + PRETTY_HTML
+        PYTHON_PART[1] + '\n' + HTML_PART[1] + '\n' + PYTHON_INLINE[1] + '\n' + HTML_PART[1] + '\n'
     ),
 ]])
 def test_compose_text_types(input, expected):

uiqmako_api/schemas/edits.py

@@ -39,9 +39,5 @@ def compose_text_types(self):
         if self.by_type:
             full_text = ''
             for type, text in self.by_type:
-                if type == 'html':
-                    text = BeautifulSoup(
-                        text, "html.parser"
-                    ).prettify(formatter=None)
                 full_text += text + '\n'
             self.def_body_text = full_text