hdr: add PartFactory loads FooterPart

scanny · scanny · commit 0c90ce39dd6a · 2019-01-06T14:26:12.000-08:00
diff --git a/docx/__init__.py b/docx/__init__.py
@@ -12,7 +12,7 @@
 from docx.opc.parts.coreprops import CorePropertiesPart
 
 from docx.parts.document import DocumentPart
-from docx.parts.hdrftr import HeaderPart
+from docx.parts.hdrftr import FooterPart, HeaderPart
 from docx.parts.image import ImagePart
 from docx.parts.numbering import NumberingPart
 from docx.parts.settings import SettingsPart
@@ -28,6 +28,7 @@ def part_class_selector(content_type, reltype):
 PartFactory.part_class_selector = part_class_selector
 PartFactory.part_type_for[CT.OPC_CORE_PROPERTIES] = CorePropertiesPart
 PartFactory.part_type_for[CT.WML_DOCUMENT_MAIN] = DocumentPart
+PartFactory.part_type_for[CT.WML_FOOTER] = FooterPart
 PartFactory.part_type_for[CT.WML_HEADER] = HeaderPart
 PartFactory.part_type_for[CT.WML_NUMBERING] = NumberingPart
 PartFactory.part_type_for[CT.WML_SETTINGS] = SettingsPart
@@ -37,6 +38,7 @@ def part_class_selector(content_type, reltype):
     CT,
     CorePropertiesPart,
     DocumentPart,
+    FooterPart,
     HeaderPart,
     NumberingPart,
     PartFactory,
diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
@@ -93,6 +93,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
     CT_SectType,
 )
 register_element_cls("w:footerReference", CT_HdrFtrRef)
+register_element_cls("w:ftr", CT_HdrFtr)
 register_element_cls("w:hdr", CT_HdrFtr)
 register_element_cls("w:headerReference", CT_HdrFtrRef)
 register_element_cls("w:pgMar", CT_PageMar)
diff --git a/features/hdr-header-footer.feature b/features/hdr-header-footer.feature
@@ -57,7 +57,6 @@ Feature: Header and footer behaviors
       | with no    | True  |
 
 
-  @wip
   Scenario: _Footer inherits content
     Given a _Footer object with a footer definition as footer
       And the next _Footer object with no footer definition as footer_2
diff --git a/tests/parts/test_hdrftr.py b/tests/parts/test_hdrftr.py
@@ -17,6 +17,20 @@
 
 class DescribeFooterPart(object):
 
+    def it_is_used_by_loader_to_construct_footer_part(
+        self, package_, FooterPart_load_, footer_part_
+    ):
+        partname = "footer1.xml"
+        content_type = CT.WML_FOOTER
+        reltype = RT.FOOTER
+        blob = "<w:ftr/>"
+        FooterPart_load_.return_value = footer_part_
+
+        part = PartFactory(partname, content_type, reltype, blob, package_)
+
+        FooterPart_load_.assert_called_once_with(partname, content_type, blob, package_)
+        assert part is footer_part_
+
     def it_can_create_a_new_footer_part(
         self, package_, _default_footer_xml_, parse_xml_, _init_
     ):
@@ -49,6 +63,14 @@ def it_loads_default_footer_XML_from_a_template_to_help(self):
     def _default_footer_xml_(self, request):
         return method_mock(request, FooterPart, "_default_footer_xml", autospec=False)
 
+    @pytest.fixture
+    def footer_part_(self, request):
+        return instance_mock(request, FooterPart)
+
+    @pytest.fixture
+    def FooterPart_load_(self, request):
+        return method_mock(request, FooterPart, "load", autospec=False)
+
     @pytest.fixture
     def _init_(self, request):
         return initializer_mock(request, FooterPart)

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):`
`93`	`93`	`CT_SectType,`
`94`	`94`	`)`
`95`	`95`	`register_element_cls("w:footerReference", CT_HdrFtrRef)`
	`96`	`+register_element_cls("w:ftr", CT_HdrFtr)`
`96`	`97`	`register_element_cls("w:hdr", CT_HdrFtr)`
`97`	`98`	`register_element_cls("w:headerReference", CT_HdrFtrRef)`
`98`	`99`	`register_element_cls("w:pgMar", CT_PageMar)`