doc: add DocumentPart.tables

Steve Canny · Steve Canny · commit fe4b7b875561 · 2014-01-03T23:39:55.000-08:00
diff --git a/docx/parts/document.py b/docx/parts/document.py
@@ -117,7 +117,7 @@ def tables(self):
         document, in document order. Note that tables within revision marks
         such as ``<w:ins>`` or ``<w:del>`` do not appear in this list.
         """
-        raise NotImplementedError
+        return self.body.tables
 
 
 class _Body(object):
diff --git a/features/api-add-table.feature b/features/api-add-table.feature
@@ -3,14 +3,12 @@ Feature: Add a table
   As a programmer using the basic python-docx API
   I need a method that adds a table at the end of the document
 
-  @wip
   Scenario: Add a table specifying only row and column count
     Given a document
      When I add a 2 x 2 table specifying only row and column count
      Then the document contains a 2 x 2 table
       And the table style is 'LightShading-Accent1'
 
-  @wip
   Scenario: Add a table specifying style
     Given a document
      When I add a 2 x 2 table specifying style 'foobar'
diff --git a/features/steps/api.py b/features/steps/api.py
@@ -105,8 +105,8 @@ def then_document_contains_2x2_table(context):
     table = document.tables[-1]
     assert isinstance(table, Table)
     assert len(table.rows) == 2
-    assert len(table.cols) == 2
-    context.table = table
+    assert len(table.columns) == 2
+    context.table_ = table
 
 
 @then('the last paragraph contains only a page break')
@@ -189,5 +189,5 @@ def then_style_of_last_paragraph_is_style(context, style):
 
 @then('the table style is \'{style}\'')
 def then_table_style_is_style(context, style):
-    table = context.table
+    table = context.table_
     assert table.style == style
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
@@ -114,6 +114,11 @@ def it_provides_access_to_the_document_paragraphs(
         paragraphs = document_part.paragraphs
         assert paragraphs is paragraphs_
 
+    def it_provides_access_to_the_document_tables(self, tables_fixture):
+        document_part, tables_ = tables_fixture
+        tables = document_part.tables
+        assert tables is tables_
+
     def it_provides_access_to_the_inline_shapes_in_the_document(
             self, inline_shapes_fixture):
         document, InlineShapes_, body_elm = inline_shapes_fixture
@@ -306,6 +311,16 @@ def serialize_part_xml_(self, request):
     def table_(self, request):
         return instance_mock(request, Table)
 
+    @pytest.fixture
+    def tables_(self, request):
+        return instance_mock(request, list)
+
+    @pytest.fixture
+    def tables_fixture(self, document_part_body_, body_, tables_):
+        document_part = DocumentPart(None, None, None, None)
+        body_.tables = tables_
+        return document_part, tables_
+
 
 class Describe_Body(object):
 
