text: add 'text' param to Paragraph.add_run()

Steve Canny · Steve Canny · commit 6b6538134ea4 · 2014-01-04T22:44:03.000-08:00
diff --git a/docx/text.py b/docx/text.py
@@ -17,12 +17,15 @@ def __init__(self, p):
         super(Paragraph, self).__init__()
         self._p = p
 
-    def add_run(self):
+    def add_run(self, text=None):
         """
         Append a run to this paragraph.
         """
         r = self._p.add_r()
-        return Run(r)
+        run = Run(r)
+        if text:
+            run.add_text(text)
+        return run
 
     @property
     def runs(self):
diff --git a/tests/test_text.py b/tests/test_text.py
@@ -29,8 +29,11 @@ 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, expected_xml = add_run_fixture
-        run = paragraph.add_run()
+        paragraph, text, expected_xml = add_run_fixture
+        if text is None:
+            run = paragraph.add_run()
+        else:
+            run = paragraph.add_run(text)
         assert paragraph._p.xml == expected_xml
         assert isinstance(run, Run)
         assert run._r is paragraph._p.r_lst[0]
@@ -61,10 +64,14 @@ def it_knows_the_text_it_contains(self, text_prop_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def add_run_fixture(self, paragraph):
-        expected_xml = a_p().with_nsdecls().with_child(an_r()).xml()
-        return paragraph, expected_xml
+    @pytest.fixture(params=[None, '', 'foobar'])
+    def add_run_fixture(self, request, paragraph):
+        text = request.param
+        r_bldr = an_r()
+        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
 
     @pytest.fixture
     def p_(self, request, r_, r_2_):
