cell: rewrite _Cell.add_table()

Steve Canny · Steve Canny · commit 558a124bca0f · 2015-02-21T14:11:36.000-08:00
diff --git a/docx/table.py b/docx/table.py
@@ -9,7 +9,7 @@
 from .blkcntnr import BlockItemContainer
 from .enum.style import WD_STYLE_TYPE
 from .oxml.simpletypes import ST_Merge
-from .shared import lazyproperty, Parented
+from .shared import Inches, lazyproperty, Parented
 
 
 class Table(Parented):
@@ -201,9 +201,10 @@ def add_table(self, rows, cols):
         added after the table because Word requires a paragraph element as
         the last element in every cell.
         """
-        new_table = super(_Cell, self).add_table(rows, cols, 914400)
+        width = self.width if self.width is not None else Inches(1)
+        table = super(_Cell, self).add_table(rows, cols, width)
         self.add_paragraph()
-        return new_table
+        return table
 
     def merge(self, other_cell):
         """
diff --git a/features/cel-add-table.feature b/features/cel-add-table.feature
@@ -4,7 +4,6 @@ Feature: Add a table into a table cell
   I need a way to add a table to a table cell
 
 
-  @wip
   Scenario: Add a table into a table cell
     Given a table cell
      When I add a 2 x 2 table into the first cell
diff --git a/tests/test_files/snippets/new-tbl.txt b/tests/test_files/snippets/new-tbl.txt
@@ -36,3 +36,46 @@
     </w:tc>
   </w:tr>
 </w:tbl>
+
+<w:tc xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">
+  <w:p/>
+  <w:tbl>
+    <w:tblPr>
+      <w:tblW w:type="auto" w:w="0"/>
+      <w:tblLook w:firstColumn="1" w:firstRow="1" w:lastColumn="0" w:lastRow="0" w:noHBand="0" w:noVBand="1" w:val="04A0"/>
+    </w:tblPr>
+    <w:tblGrid>
+      <w:gridCol w:w="720"/>
+      <w:gridCol w:w="720"/>
+    </w:tblGrid>
+    <w:tr>
+      <w:tc>
+        <w:tcPr>
+          <w:tcW w:type="dxa" w:w="720"/>
+        </w:tcPr>
+        <w:p/>
+      </w:tc>
+      <w:tc>
+        <w:tcPr>
+          <w:tcW w:type="dxa" w:w="720"/>
+        </w:tcPr>
+        <w:p/>
+      </w:tc>
+    </w:tr>
+    <w:tr>
+      <w:tc>
+        <w:tcPr>
+          <w:tcW w:type="dxa" w:w="720"/>
+        </w:tcPr>
+        <w:p/>
+      </w:tc>
+      <w:tc>
+        <w:tcPr>
+          <w:tcW w:type="dxa" w:w="720"/>
+        </w:tcPr>
+        <w:p/>
+      </w:tc>
+    </w:tr>
+  </w:tbl>
+  <w:p/>
+</w:tc>
diff --git a/tests/test_table.py b/tests/test_table.py
@@ -338,8 +338,8 @@ def it_can_add_a_paragraph(self, add_paragraph_fixture):
 
     def it_can_add_a_table(self, add_table_fixture):
         cell, expected_xml = add_table_fixture
-        table = cell.add_table(rows=0, cols=1)
-        assert cell._tc.xml == expected_xml
+        table = cell.add_table(rows=2, cols=2)
+        assert cell._element.xml == expected_xml
         assert isinstance(table, Table)
 
     def it_can_merge_itself_with_other_cells(self, merge_fixture):
@@ -363,21 +363,10 @@ def add_paragraph_fixture(self, request):
         expected_xml = xml(after_tc_cxml)
         return cell, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:tc',     'w:tc/(w:tbl'),
-        ('w:tc/w:p', 'w:tc/(w:p, w:tbl'),
-    ])
+    @pytest.fixture
     def add_table_fixture(self, request):
-        tc_cxml, after_tc_cxml = request.param
-        # the table has some overhead elements, also a blank para after since
-        # it's in a cell.
-        after_tc_cxml += (
-            '/(w:tblPr/(w:tblW{w:type=auto,w:w=0},w:tblLook{w:firstColumn=1,'
-            'w:firstRow=1,w:lastColumn=0,w:lastRow=0,w:noHBand=0,w:noVBand=1'
-            ',w:val=04A0}),w:tblGrid/w:gridCol{w:w=1440}),w:p)'
-        )
-        cell = _Cell(element(tc_cxml), None)
-        expected_xml = xml(after_tc_cxml)
+        cell = _Cell(element('w:tc/w:p'), None)
+        expected_xml = snippet_seq('new-tbl')[1]
         return cell, expected_xml
 
     @pytest.fixture
