para: reposition a couple test fixtures

Steve Canny · Steve Canny · commit 70b580e17607 · 2014-06-26T21:53:40.000-07:00
No code changes.
diff --git a/features/steps/paragraph.py b/features/steps/paragraph.py
@@ -47,12 +47,7 @@ def given_a_paragraph_with_content_and_formatting(context):
 
 @when('I add a run to the paragraph')
 def when_add_new_run_to_paragraph(context):
-    context.r = context.p.add_run()
-
-
-@when('I add text to the run')
-def when_I_add_text_to_the_run(context):
-    context.r.add_text(test_text)
+    context.run = context.p.add_run()
 
 
 @when('I clear the paragraph content')
diff --git a/features/steps/text.py b/features/steps/text.py
@@ -113,6 +113,11 @@ def when_I_add_a_tab(context):
     context.run.add_tab()
 
 
+@when('I add text to the run')
+def when_I_add_text_to_the_run(context):
+    context.run.add_text(test_text)
+
+
 @when('I assign mixed text to the text property')
 def when_I_assign_mixed_text_to_the_text_property(context):
     context.run.text = 'abc\tdef\nghi\rjkl'
diff --git a/tests/test_text.py b/tests/test_text.py
@@ -61,9 +61,9 @@ def it_can_set_its_paragraph_style(self):
             p.style = style
             assert p_elm.style == expected_setting
 
-    def it_knows_the_text_it_contains(self, text_prop_fixture):
-        p, expected_text = text_prop_fixture
-        assert p.text == expected_text
+    def it_knows_the_text_it_contains(self, text_get_fixture):
+        paragraph, expected_text = text_get_fixture
+        assert paragraph.text == expected_text
 
     def it_can_insert_a_paragraph_before_itself(self, insert_before_fixture):
         paragraph, text, style, body, expected_xml = insert_before_fixture
@@ -135,6 +135,24 @@ def insert_before_fixture(self):
         ).xml()
         return paragraph, text, style, body, expected_xml
 
+    @pytest.fixture
+    def runs_fixture(self, p_, Run_, r_, r_2_, runs_):
+        paragraph = Paragraph(p_)
+        run_, run_2_ = runs_
+        return paragraph, Run_, r_, r_2_, run_, run_2_
+
+    @pytest.fixture
+    def text_get_fixture(self):
+        p = (
+            a_p().with_nsdecls().with_child(
+                an_r().with_child(
+                    a_t().with_text('foo'))).with_child(
+                an_r().with_child(
+                    a_t().with_text(' de bar')))
+        ).element
+        paragraph = Paragraph(p)
+        return paragraph, 'foo de bar'
+
     # fixture components ---------------------------------------------
 
     @pytest.fixture
@@ -167,24 +185,6 @@ def runs_(self, request):
         run_2_ = instance_mock(request, Run, name='run_2_')
         return run_, run_2_
 
-    @pytest.fixture
-    def runs_fixture(self, p_, Run_, r_, r_2_, runs_):
-        paragraph = Paragraph(p_)
-        run_, run_2_ = runs_
-        return paragraph, Run_, r_, r_2_, run_, run_2_
-
-    @pytest.fixture
-    def text_prop_fixture(self):
-        p = (
-            a_p().with_nsdecls().with_child(
-                an_r().with_child(
-                    a_t().with_text('foo'))).with_child(
-                an_r().with_child(
-                    a_t().with_text(' de bar')))
-        ).element
-        paragraph = Paragraph(p)
-        return paragraph, 'foo de bar'
-
 
 class DescribeRun(object):
 
