Fixed unittests by wrapping all texts in <p>

Author: botzill

pydocx/export/base.py

@@ -341,7 +341,6 @@ def export_run(self, run):
         if self.first_pass:
             if self.captured_runs is not None:
                 self.captured_runs.append(run)
-
         # TODO squash multiple sequential text nodes into one?
         results = self.yield_nested(run.children, self.export_node)
         if run.effective_properties:

pydocx/export/html.py

@@ -258,10 +258,12 @@ def export_footnote(self, footnote):
         return tag.apply(results, allow_empty=False)
 
     def get_paragraph_tag(self, paragraph):
-        if self.in_table_cell and paragraph.parent.properties.is_continue_vertical_merge:
-            # We ignore such paragraphs here because are added via rowspan
-            return
-        elif paragraph.is_empty:
+        if isinstance(paragraph.parent, wordprocessing.TableCell):
+            cell_properties = paragraph.parent.properties
+            if cell_properties and cell_properties.is_continue_vertical_merge:
+                # We ignore such paragraphs here because are added via rowspan
+                return
+        if paragraph.is_empty:
             return HtmlTag('p', custom_text=HTML_WHITE_SPACE)
 
         heading_style = paragraph.heading_style
@@ -291,7 +293,7 @@ def export_paragraph(self, paragraph):
         tag = self.get_paragraph_tag(paragraph)
         if tag:
             attrs = self.get_paragraph_styles(paragraph)
-            tag.attrs = attrs
+            tag.attrs.update(attrs)
             results = tag.apply(results)
 
         for result in results:
@@ -345,6 +347,11 @@ def get_paragraph_property_spacing(self, paragraph):
         if self.first_pass:
             return style
 
+        try:
+            current_par_index = self.paragraphs.index(paragraph)
+        except ValueError:
+            return style
+
         previous_paragraph = None
         next_paragraph = None
         previous_paragraph_spacing = None
@@ -353,7 +360,6 @@ def get_paragraph_property_spacing(self, paragraph):
         spacing_before = None
 
         current_paragraph_spacing = paragraph.get_spacing()
-        current_par_index = self.paragraphs.index(paragraph)
 
         if current_par_index > 0:
             previous_paragraph = self.paragraphs[current_par_index - 1]

pydocx/openxml/wordprocessing/paragraph.py

@@ -7,6 +7,7 @@
 
 from pydocx.models import XmlModel, XmlCollection, XmlChild
 from pydocx.openxml.wordprocessing.bookmark import Bookmark
+from pydocx.openxml.wordprocessing.br import Break
 from pydocx.openxml.wordprocessing.deleted_run import DeletedRun
 from pydocx.openxml.wordprocessing.hyperlink import Hyperlink
 from pydocx.openxml.wordprocessing.inserted_run import InsertedRun
@@ -48,11 +49,14 @@ def is_empty(self):
 
         # we may have cases when a paragraph has a Bookmark with name '_GoBack'
         # and we should treat it as empty paragraph
-        if len(self.children) == 1 and \
-                isinstance(self.children[0], Bookmark) and \
-                        self.children[0].name in ('_GoBack',):
-            return True
-
+        if len(self.children) == 1:
+            first_child = self.children[0]
+            if isinstance(first_child, Bookmark) and \
+                            first_child.name in ('_GoBack',):
+                return True
+            # We can have cases when only run properties are defined and no text
+            elif not first_child.children:
+                return True
         return False
 
     @property

tests/export/html/test_field_code.py

@@ -206,6 +206,7 @@ def test_spanning_multiple_paragraphs(self):
 
         expected_html = '''
             <p>Link: </p>
+            <p></p>
             <p><a href="http://www.google.com/">AAABBB</a></p>
             <p><a href="http://www.google.com/">CCC</a></p>
             <p><a href="http://www.google.com/">DDD</a>.</p>

tests/export/html/test_heading.py

@@ -274,7 +274,7 @@ def test_heading_in_a_nested_list_numbering_is_preserved_with_strong(self):
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
                 <li>
-                    foo
+                    <p>foo</p>
                     <ol class="pydocx-list-style-type-lowerLetter">
                         <li>
                             <strong>bar</strong>
@@ -351,10 +351,10 @@ def test_heading_in_nested_sub_list(self):
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
                     <li>
-                            foo
-                            <ol class="pydocx-list-style-type-lowerLetter">
-                                    <li>bar</li>
-                            </ol>
+                        <p>foo</p>
+                        <ol class="pydocx-list-style-type-lowerLetter">
+                                <li><p>bar</p></li>
+                        </ol>
                     </li>
             </ol>
             <h1>baz</h1>
@@ -416,8 +416,7 @@ def test_headings_in_list_surrounding_paragraph_stay_in_list_with_strong(self):
             <ol class="pydocx-list-style-type-decimal">
                 <li>
                     <strong>foo</strong>
-                    <br />
-                    bare paragraph
+                    <p>bare paragraph</p>
                 </li>
                 <li>
                     <strong>bar</strong>
@@ -527,7 +526,7 @@ def test_heading_as_new_list_following_bare_paragraph_plus_list(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
-                <li>foo</li>
+                <li><p>foo</p></li>
             </ol>
             <p>bare paragraph</p>
             <ol class="pydocx-list-style-type-decimal">
@@ -588,7 +587,10 @@ def test_heading_as_list_following_bare_paragraph_plus_list(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
-                <li>foo<br />bare paragraph</li>
+                <li>
+                    <p>foo</p>
+                    <p>bare paragraph</p>
+                </li>
                 <li><strong>bar</strong></li>
             </ol>
         '''
@@ -662,13 +664,13 @@ def test_list_heading_table_paragraph(self):
 
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
-                <li>single list item</li>
+                <li><p>single list item</p></li>
             </ol>
             <h1>actual heading</h1>
             <p>before table</p>
             <table border="1">
                 <tr>
-                    <td>foo</td>
+                    <td><p>foo</p></td>
                 </tr>
             </table>
             <p>after table</p>
@@ -739,7 +741,7 @@ def test_single_lvl_list_has_precedence_over_headings(self):
         expected_html = '''
             <ol class="pydocx-list-style-type-decimal">
                 <li><strong>foo</strong></li>
-                <li>non-heading list item</li>
+                <li><p>non-heading list item</p></li>
                 <li><strong>bar</strong></li>
             </ol>
         '''

tests/export/html/test_hyperlink.py

@@ -86,7 +86,7 @@ def test_no_link_text(self):
 
         document.add(MainDocumentPart, document_xml, document_rels)
 
-        expected_html = ''
+        expected_html = '<p>&#160;</p>'
         self.assert_document_generates_html(document, expected_html)
 
     def test_undefined_relationship(self):

tests/export/html/test_markup_compatibility.py

@@ -155,7 +155,9 @@ def test_fallback_contains_a_table(self):
             <p>AAABBB</p>
             <table border="1">
                 <tr>
-                    <td>CCC</td>
+                    <td>
+                        <p>CCC</p>
+                    </td>
                 </tr>
             </table>
             <p>DDDEEE</p>
@@ -204,7 +206,9 @@ def test_fallback_has_invalid_children(self):
             <p>AAABBB
                 <table border="1">
                     <tr>
-                        <td>CCC</td>
+                        <td>
+                            <p>CCC</p>
+                        </td>
                     </tr>
                 </table>
             DDDEEE</p>