font: add Font.color

Steve Canny · Steve Canny · commit f2a3d7c0ff21 · 2015-02-19T21:38:58.000-08:00
diff --git a/docs/conf.py b/docs/conf.py
@@ -81,6 +81,8 @@
 
 .. |Cm| replace:: :class:`.Cm`
 
+.. |ColorFormat| replace:: :class:`.ColorFormat`
+
 .. |_Column| replace:: :class:`._Column`
 
 .. |_Columns| replace:: :class:`._Columns`
diff --git a/docx/text/font.py b/docx/text/font.py
@@ -8,6 +8,7 @@
     absolute_import, division, print_function, unicode_literals
 )
 
+from ..dml.color import ColorFormat
 from ..shared import ElementProxy
 
 
@@ -42,6 +43,14 @@ def bold(self):
     def bold(self, value):
         self._set_bool_prop('b', value)
 
+    @property
+    def color(self):
+        """
+        A |ColorFormat| object providing a way to get and set the text color
+        for this font.
+        """
+        return ColorFormat(self._element)
+
     @property
     def complex_script(self):
         """
diff --git a/features/txt-font-props.feature b/features/txt-font-props.feature
@@ -48,7 +48,6 @@ Feature: Get or set font properties
       | 18 pt       | None   |
 
 
-  @wip
   Scenario: Get font color object
     Given a font
      Then font.color is a ColorFormat object
diff --git a/tests/text/test_font.py b/tests/text/test_font.py
@@ -8,17 +8,25 @@
     absolute_import, division, print_function, unicode_literals
 )
 
+from docx.dml.color import ColorFormat
 from docx.enum.text import WD_UNDERLINE
 from docx.shared import Pt
 from docx.text.font import Font
 
 import pytest
 
 from ..unitutil.cxml import element, xml
+from ..unitutil.mock import class_mock, instance_mock
 
 
 class DescribeFont(object):
 
+    def it_provides_access_to_its_color_object(self, color_fixture):
+        font, color_, ColorFormat_ = color_fixture
+        color = font.color
+        ColorFormat_.assert_called_once_with(font.element)
+        assert color is color_
+
     def it_knows_its_typeface_name(self, name_get_fixture):
         font, expected_value = name_get_fixture
         assert font.name == expected_value
@@ -161,6 +169,11 @@ def bool_prop_set_fixture(self, request):
         expected_xml = xml(expected_cxml)
         return font, prop_name, value, expected_xml
 
+    @pytest.fixture
+    def color_fixture(self, ColorFormat_, color_):
+        font = Font(element('w:r'))
+        return font, color_, ColorFormat_
+
     @pytest.fixture(params=[
         ('w:r',                               None),
         ('w:r/w:rPr',                         None),
@@ -325,3 +338,15 @@ def underline_set_fixture(self, request):
         run = Font(element(initial_r_cxml), None)
         expected_xml = xml(expected_cxml)
         return run, value, expected_xml
+
+    # fixture components ---------------------------------------------
+
+    @pytest.fixture
+    def color_(self, request):
+        return instance_mock(request, ColorFormat)
+
+    @pytest.fixture
+    def ColorFormat_(self, request, color_):
+        return class_mock(
+            request, 'docx.text.font.ColorFormat', return_value=color_
+        )
