acpt: migrate doc-add-table.feature

Steve Canny · Steve Canny · commit e13066203813 · 2015-02-14T22:05:18.000-08:00
diff --git a/features/doc-add-table.feature b/features/doc-add-table.feature
@@ -1,18 +1,18 @@
 Feature: Add a table
   In order to include tablular information in a document
-  As a programmer using the basic python-docx API
-  I need a method that adds a table at the end of the document
+  As a developer using python-docx
+  I need a way to add a table
 
 
   Scenario: Add a table specifying only row and column count
-    Given a document
+    Given a blank 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 table.style is styles['Light Shading Accent 1']
 
 
   Scenario: Add a table specifying style
-    Given a document
+    Given a blank document
      When I add a 2 x 2 table specifying style 'Table Grid'
      Then the document contains a 2 x 2 table
       And table.style is styles['Table Grid']
diff --git a/features/steps/api.py b/features/steps/api.py
@@ -9,7 +9,6 @@
 import docx
 
 from docx import DocumentNew
-from docx.table import Table
 
 from helpers import test_docx
 
@@ -23,18 +22,6 @@ def given_I_have_python_docx_installed(context):
 
 # when =====================================================
 
-@when('I add a 2 x 2 table specifying only row and column count')
-def when_add_2x2_table_specifying_only_row_and_col_count(context):
-    document = context.document
-    document.add_table(rows=2, cols=2)
-
-
-@when('I add a 2 x 2 table specifying style \'{style_name}\'')
-def when_add_2x2_table_specifying_style_name(context, style_name):
-    document = context.document
-    document.add_table(rows=2, cols=2, style=style_name)
-
-
 @when('I call docx.Document() with no arguments')
 def when_I_call_docx_Document_with_no_arguments(context):
     context.document = DocumentNew()
@@ -53,16 +40,6 @@ def then_document_is_a_Document_object(context):
     assert isinstance(document, docx.document.Document)
 
 
-@then('the document contains a 2 x 2 table')
-def then_document_contains_2x2_table(context):
-    document = context.document
-    table = document.tables[-1]
-    assert isinstance(table, Table)
-    assert len(table.rows) == 2
-    assert len(table.columns) == 2
-    context.table_ = table
-
-
 @then('the last paragraph contains the text I specified')
 def then_last_p_contains_specified_text(context):
     document = context.document
diff --git a/features/steps/document.py b/features/steps/document.py
@@ -13,6 +13,7 @@
 from docx.parts.document import Sections
 from docx.section import Section
 from docx.shared import Inches
+from docx.table import Table
 
 from helpers import test_docx, test_file
 
@@ -44,6 +45,18 @@ def given_a_single_section_document_having_portrait_layout(context):
 
 # when ====================================================
 
+@when('I add a 2 x 2 table specifying only row and column count')
+def when_add_2x2_table_specifying_only_row_and_col_count(context):
+    document = context.document
+    document.add_table(rows=2, cols=2)
+
+
+@when('I add a 2 x 2 table specifying style \'{style_name}\'')
+def when_add_2x2_table_specifying_style_name(context, style_name):
+    document = context.document
+    document.add_table(rows=2, cols=2, style=style_name)
+
+
 @when('I add a heading specifying level={level}')
 def when_add_heading_specifying_level(context, level):
     context.document.add_heading(level=int(level))
@@ -158,6 +171,16 @@ def then_I_can_iterate_over_the_sections(context):
     assert actual_count == 3
 
 
+@then('the document contains a 2 x 2 table')
+def then_document_contains_2x2_table(context):
+    document = context.document
+    table = document.tables[-1]
+    assert isinstance(table, Table)
+    assert len(table.rows) == 2
+    assert len(table.columns) == 2
+    context.table_ = table
+
+
 @then('the document has two sections')
 def then_the_document_has_two_sections(context):
     assert len(context.document.sections) == 2
