acpt: groom some existing acceptance tests

Steve Canny · Steve Canny · commit 5309b41a2232 · 2015-02-21T14:10:38.000-08:00
* add specific Given for a document having the built-in styles
* constrain 'Given a blank document' to not have the built-in styles
* revise some steps to make them more concise
* extract bool_vals and tri_state_vals to helpers
diff --git a/features/doc-add-heading.feature b/features/doc-add-heading.feature
@@ -5,14 +5,14 @@ Feature: Add a heading paragraph
 
 
   Scenario: Add a heading specifying only its text
-    Given a blank document
+    Given a document having built-in styles
      When I add a heading specifying only its text
      Then the style of the last paragraph is 'Heading 1'
       And the last paragraph contains the heading text
 
 
   Scenario Outline: Add a heading specifying level
-    Given a blank document
+    Given a document having built-in styles
      When I add a heading specifying level=<level>
      Then the style of the last paragraph is '<style>'
 
diff --git a/features/doc-add-table.feature b/features/doc-add-table.feature
@@ -5,14 +5,14 @@ Feature: Add a table
 
 
   Scenario: Add a table specifying only row and column count
-    Given a blank document
+    Given a document having built-in styles
      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 blank document
+    Given a document having built-in styles
      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/block.py b/features/steps/block.py
@@ -16,8 +16,7 @@
 
 @given('a document containing a table')
 def given_a_document_containing_a_table(context):
-    docx_path = test_docx('blk-containing-table')
-    context.document = Document(docx_path)
+    context.document = Document(test_docx('blk-containing-table'))
 
 
 @given('a paragraph')
diff --git a/features/steps/document.py b/features/steps/document.py
@@ -24,6 +24,11 @@
 
 @given('a blank document')
 def given_a_blank_document(context):
+    context.document = Document(test_docx('doc-word-default-blank'))
+
+
+@given('a document having built-in styles')
+def given_a_document_having_builtin_styles(context):
     context.document = Document()
 
 
@@ -198,9 +203,8 @@ def then_document_tables_is_a_list_containing_three_tables(context):
 
 
 @then('the document contains a 2 x 2 table')
-def then_document_contains_2x2_table(context):
-    document = context.document
-    table = document.tables[-1]
+def then_the_document_contains_a_2x2_table(context):
+    table = context.document.tables[-1]
     assert isinstance(table, Table)
     assert len(table.rows) == 2
     assert len(table.columns) == 2
diff --git a/features/steps/helpers.py b/features/steps/helpers.py
@@ -16,8 +16,19 @@ def absjoin(*paths):
 # scratch output docx file -------------
 saved_docx_path = absjoin(scratch_dir, 'test_out.docx')
 
+bool_vals = {
+    'True':  True,
+    'False': False
+}
+
 test_text = 'python-docx was here!'
 
+tri_state_vals = {
+    'True':  True,
+    'False': False,
+    'None':  None,
+}
+
 
 def test_docx(name):
     """
diff --git a/features/steps/styles.py b/features/steps/styles.py
@@ -13,12 +13,7 @@
 from docx.text.font import Font
 from docx.text.parfmt import ParagraphFormat
 
-from helpers import test_docx
-
-bool_vals = {
-    'True':  True,
-    'False': False
-}
+from helpers import bool_vals, test_docx, tri_state_vals
 
 style_types = {
     'WD_STYLE_TYPE.CHARACTER': WD_STYLE_TYPE.CHARACTER,
@@ -27,12 +22,6 @@
     'WD_STYLE_TYPE.TABLE':     WD_STYLE_TYPE.TABLE,
 }
 
-tri_state_vals = {
-    'True':  True,
-    'False': False,
-    'None':  None,
-}
-
 
 # given ===================================================
 
diff --git a/features/steps/test_files/doc-word-default-blank.docx b/features/steps/test_files/doc-word-default-blank.docx
