acpt: migrate doc-add-picture.feature

Steve Canny · Steve Canny · commit 08703b63e3f0 · 2015-02-14T21:53:09.000-08:00
diff --git a/features/doc-add-picture.feature b/features/doc-add-picture.feature
@@ -1,26 +1,30 @@
-Feature: Append an inline picture on its own paragraph
+Feature: Append an inline picture in its own paragraph
   In order add an image to a document
-  As a programmer using the basic python-docx API
-  I need a method that adds a picture in its own paragraph
+  As a developer using python-docx
+  I need a way to add a picture in its own paragraph
+
 
   Scenario: Add a picture at native size
-    Given a document
+    Given a blank document
      When I add a picture specifying only the image file
      Then the document contains the inline picture
       And the picture has its native width and height
 
+
   Scenario: Add a picture specifying both width and height
-    Given a document
+    Given a blank document
      When I add a picture specifying 1.75" width and 2.5" height
-     Then the picture width is 1.75 inches
-      And the picture height is 2.5 inches
+     Then picture.width is 1.75 inches
+      And picture.height is 2.5 inches
+
 
   Scenario: Add a picture specifying only width
-    Given a document
+    Given a blank document
      When I add a picture specifying a width of 1.5 inches
-     Then the picture height is 2.14 inches
+     Then picture.height is 2.14 inches
+
 
   Scenario: Add a picture specifying only height
-    Given a document
+    Given a blank document
      When I add a picture specifying a height of 1.5 inches
-     Then the picture width is 1.05 inches
+     Then picture.width is 1.05 inches
diff --git a/features/steps/api.py b/features/steps/api.py
@@ -9,10 +9,9 @@
 import docx
 
 from docx import DocumentNew
-from docx.shared import Inches
 from docx.table import Table
 
-from helpers import test_docx, test_file
+from helpers import test_docx
 
 
 # given ====================================================
@@ -36,37 +35,6 @@ def when_add_2x2_table_specifying_style_name(context, style_name):
     document.add_table(rows=2, cols=2, style=style_name)
 
 
-@when('I add a picture specifying 1.75" width and 2.5" height')
-def when_add_picture_specifying_width_and_height(context):
-    document = context.document
-    context.picture = document.add_picture(
-        test_file('monty-truth.png'),
-        width=Inches(1.75), height=Inches(2.5)
-    )
-
-
-@when('I add a picture specifying a height of 1.5 inches')
-def when_add_picture_specifying_height(context):
-    document = context.document
-    context.picture = document.add_picture(
-        test_file('monty-truth.png'), height=Inches(1.5)
-    )
-
-
-@when('I add a picture specifying a width of 1.5 inches')
-def when_add_picture_specifying_width(context):
-    document = context.document
-    context.picture = document.add_picture(
-        test_file('monty-truth.png'), width=Inches(1.5)
-    )
-
-
-@when('I add a picture specifying only the image file')
-def when_add_picture_specifying_only_image_file(context):
-    document = context.document
-    context.picture = document.add_picture(test_file('monty-truth.png'))
-
-
 @when('I call docx.Document() with no arguments')
 def when_I_call_docx_Document_with_no_arguments(context):
     context.document = DocumentNew()
diff --git a/features/steps/document.py b/features/steps/document.py
@@ -12,8 +12,9 @@
 from docx.enum.section import WD_ORIENT, WD_SECTION
 from docx.parts.document import Sections
 from docx.section import Section
+from docx.shared import Inches
 
-from helpers import test_docx
+from helpers import test_docx, test_file
 
 
 # given ===================================================
@@ -85,6 +86,37 @@ def when_add_paragraph_without_specifying_text_or_style(context):
     document.add_paragraph()
 
 
+@when('I add a picture specifying 1.75" width and 2.5" height')
+def when_add_picture_specifying_width_and_height(context):
+    document = context.document
+    context.picture = document.add_picture(
+        test_file('monty-truth.png'),
+        width=Inches(1.75), height=Inches(2.5)
+    )
+
+
+@when('I add a picture specifying a height of 1.5 inches')
+def when_add_picture_specifying_height(context):
+    document = context.document
+    context.picture = document.add_picture(
+        test_file('monty-truth.png'), height=Inches(1.5)
+    )
+
+
+@when('I add a picture specifying a width of 1.5 inches')
+def when_add_picture_specifying_width(context):
+    document = context.document
+    context.picture = document.add_picture(
+        test_file('monty-truth.png'), width=Inches(1.5)
+    )
+
+
+@when('I add a picture specifying only the image file')
+def when_add_picture_specifying_only_image_file(context):
+    document = context.document
+    context.picture = document.add_picture(test_file('monty-truth.png'))
+
+
 @when('I add an even-page section to the document')
 def when_I_add_an_even_page_section_to_the_document(context):
     context.section = context.document.add_section(WD_SECTION.EVEN_PAGE)
diff --git a/features/steps/shape.py b/features/steps/shape.py
@@ -164,25 +164,21 @@ def then_picture_has_native_width_and_height(context):
     assert picture.height == 2717800, 'got %d' % picture.height
 
 
-@then('the picture height is 2.14 inches')
-def then_picture_height_is_value_2(context):
-    picture = context.picture
-    assert picture.height == 1956816, 'got %d' % picture.height
-
-
-@then('the picture height is 2.5 inches')
-def then_picture_height_is_value(context):
-    picture = context.picture
-    assert picture.height == 2286000, 'got %d' % picture.height
-
-
-@then('the picture width is 1.05 inches')
-def then_picture_width_is_value_2(context):
+@then('picture.height is {inches} inches')
+def then_picture_height_is_value(context, inches):
+    expected_value = {
+        '2.14': 1956816,
+        '2.5':  2286000,
+    }[inches]
     picture = context.picture
-    assert picture.width == 961402, 'got %d' % picture.width
+    assert picture.height == expected_value, 'got %d' % picture.height
 
 
-@then('the picture width is 1.75 inches')
-def then_picture_width_is_value(context):
+@then('picture.width is {inches} inches')
+def then_picture_width_is_value(context, inches):
+    expected_value = {
+        '1.05':  961402,
+        '1.75': 1600200,
+    }[inches]
     picture = context.picture
-    assert picture.width == 1600200, 'got %d' % picture.width
+    assert picture.width == expected_value, 'got %d' % picture.width
