run: add style param to Paragraph.add_run()

Victor Volle · Steve Canny · commit 10e77f0a8d0f · 2014-05-06T23:38:25.000-07:00
diff --git a/docx/text.py b/docx/text.py
@@ -58,14 +58,17 @@ def __init__(self, p):
         super(Paragraph, self).__init__()
         self._p = p
 
-    def add_run(self, text=None):
+    def add_run(self, text=None, style=None):
         """
-        Append a run to this paragraph.
+        Append a run to this paragraph containing *text* and having character
+        style identified by style ID *style*.
         """
         r = self._p.add_r()
         run = Run(r)
         if text:
             run.add_text(text)
+        if style:
+            run.style = style
         return run
 
     @property
diff --git a/features/par-add-run.feature b/features/par-add-run.feature
@@ -8,7 +8,6 @@ Feature: Add a run with optional text and style
      When I add a run specifying its text
      Then the run contains the text I specified
 
-  @wip
   Scenario: Add a run specifying its style
     Given a paragraph
      When I add a run specifying the character style Emphasis
diff --git a/tests/test_text.py b/tests/test_text.py
@@ -34,8 +34,8 @@ def it_has_a_sequence_of_the_runs_it_contains(self, runs_fixture):
         assert runs == [run_, run_2_]
 
     def it_can_add_a_run_to_itself(self, add_run_fixture):
-        paragraph, text, expected_xml = add_run_fixture
-        run = paragraph.add_run(text)
+        paragraph, text, style, expected_xml = add_run_fixture
+        run = paragraph.add_run(text, style)
         assert paragraph._p.xml == expected_xml
         assert isinstance(run, Run)
         assert run._r is paragraph._p.r_lst[0]
@@ -66,21 +66,29 @@ def it_knows_the_text_it_contains(self, text_prop_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[None, '', 'foobar'])
+    @pytest.fixture(params=[
+        (None, None), (None, 'Strong'), ('foobar', None), ('foobar', 'Strong')
+    ])
     def add_run_fixture(self, request, paragraph):
-        text = request.param
+        text, style = request.param
         r_bldr = an_r()
+        if style:
+            r_bldr.with_child(
+                an_rPr().with_child(an_rStyle().with_val(style))
+            )
         if text:
             r_bldr.with_child(a_t().with_text(text))
         expected_xml = a_p().with_nsdecls().with_child(r_bldr).xml()
-        return paragraph, text, expected_xml
+        return paragraph, text, style, expected_xml
+
+    # fixture components ---------------------------------------------
 
     @pytest.fixture
     def p_(self, request, r_, r_2_):
         return instance_mock(request, CT_P, r_lst=(r_, r_2_))
 
     @pytest.fixture
-    def paragraph(self, request):
+    def paragraph(self):
         p = a_p().with_nsdecls().element
         return Paragraph(p)
 
