run: add Run.font

Steve Canny · Steve Canny · commit 277b46c11666 · 2015-02-08T00:01:41.000-08:00
diff --git a/docx/text/run.py b/docx/text/run.py
@@ -65,7 +65,7 @@ class Run(Parented):
     """
     def __init__(self, r, parent):
         super(Run, self).__init__(parent)
-        self._r = r
+        self._r = self._element = self.element = r
 
     def add_break(self, break_type=WD_BREAK.LINE):
         """
@@ -199,6 +199,14 @@ def emboss(self):
         """
         return 'emboss'
 
+    @property
+    def font(self):
+        """
+        The |Font| object providing access to the character formatting
+        properties for this run, such as font name and size.
+        """
+        return Font(self._element)
+
     @boolproperty
     def hidden(self):
         """
diff --git a/features/run-access-font.feature b/features/run-access-font.feature
@@ -4,7 +4,6 @@ Feature: Access run font
   I need access to the font of a run
 
 
-  @wip
   Scenario: Access the font of a run
     Given a run
      Then run.font is the Font object for the run
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
@@ -56,6 +56,12 @@ def it_raises_on_assign_invalid_underline_type(
         with pytest.raises(ValueError):
             run.underline = underline
 
+    def it_provides_access_to_its_font(self, font_fixture):
+        run, Font_, font_ = font_fixture
+        font = run.font
+        Font_.assert_called_once_with(run._element)
+        assert font is font_
+
     def it_can_add_text(self, add_text_fixture):
         run, text_str, expected_xml, Text_ = add_text_fixture
         _text = run.add_text(text_str)
@@ -257,6 +263,11 @@ def clear_fixture(self, request):
         expected_xml = xml(expected_cxml)
         return run, expected_xml
 
+    @pytest.fixture
+    def font_fixture(self, Font_, font_):
+        run = Run(element('w:r'), None)
+        return run, Font_, font_
+
     @pytest.fixture(params=[
         ('w:r',                              None),
         ('w:r/w:rPr/w:rStyle{w:val=Foobar}', 'Foobar'),
@@ -350,6 +361,14 @@ def underline_raise_fixture(self, request):
 
     # fixture components ---------------------------------------------
 
+    @pytest.fixture
+    def Font_(self, request, font_):
+        return class_mock(request, 'docx.text.run.Font', return_value=font_)
+
+    @pytest.fixture
+    def font_(self, request):
+        return instance_mock(request, Font)
+
     @pytest.fixture
     def inline_shapes_(self, request, picture_):
         inline_shapes_ = instance_mock(request, InlineShapes)
