tbl: add _Row.height_rule setter

revossen-asml · Steve Canny · commit 4f12bde2473f · 2016-10-29T14:28:45.000-07:00
diff --git a/docx/oxml/table.py b/docx/oxml/table.py
@@ -71,6 +71,11 @@ def trHeight_hRule(self):
             return None
         return trPr.trHeight_hRule
 
+    @trHeight_hRule.setter
+    def trHeight_hRule(self, value):
+        trPr = self.get_or_add_trPr()
+        trPr.trHeight_hRule = value
+
     def _insert_tblPrEx(self, tblPrEx):
         self.insert(0, tblPrEx)
 
@@ -819,6 +824,13 @@ def trHeight_hRule(self):
             return None
         return trHeight.hRule
 
+    @trHeight_hRule.setter
+    def trHeight_hRule(self, value):
+        if value is None and self.trHeight is None:
+            return
+        trHeight = self.get_or_add_trHeight()
+        trHeight.hRule = value
+
 
 class CT_VMerge(BaseOxmlElement):
     """
diff --git a/docx/table.py b/docx/table.py
@@ -392,6 +392,10 @@ def height_rule(self):
         """
         return self._tr.trHeight_hRule
 
+    @height_rule.setter
+    def height_rule(self, value):
+        self._tr.trHeight_hRule = value
+
     @property
     def table(self):
         """
diff --git a/features/tbl-row-props.feature b/features/tbl-row-props.feature
@@ -15,7 +15,6 @@ Feature: Get and set table row properties
       | at least            | AT_LEAST |
 
 
-  @wip
   Scenario Outline: Set Row.height_rule
     Given a table row having height rule <state>
      When I assign <value> to row.height_rule
diff --git a/tests/test_table.py b/tests/test_table.py
@@ -657,6 +657,11 @@ def it_knows_its_height_rule(self, height_rule_get_fixture):
         row, expected_rule = height_rule_get_fixture
         assert row.height_rule == expected_rule
 
+    def it_can_change_its_height_rule(self, height_rule_set_fixture):
+        row, rule, expected_xml = height_rule_set_fixture
+        row.height_rule = rule
+        assert row._tr.xml == expected_xml
+
     def it_provides_access_to_its_cells(self, cells_fixture):
         row, row_idx, expected_cells = cells_fixture
         cells = row.cells
@@ -696,6 +701,32 @@ def height_rule_get_fixture(self, request):
         row = _Row(element(tr_cxml), None)
         return row, expected_rule
 
+    @pytest.fixture(params=[
+        ('w:tr',
+         WD_ROW_HEIGHT.AUTO,
+         'w:tr/w:trPr/w:trHeight{w:hRule=auto}'),
+        ('w:tr/w:trPr',
+         WD_ROW_HEIGHT.AT_LEAST,
+         'w:tr/w:trPr/w:trHeight{w:hRule=atLeast}'),
+        ('w:tr/w:trPr/w:trHeight',
+         WD_ROW_HEIGHT.EXACTLY,
+         'w:tr/w:trPr/w:trHeight{w:hRule=exact}'),
+        ('w:tr/w:trPr/w:trHeight{w:val=1440, w:hRule=exact}',
+         WD_ROW_HEIGHT.AUTO,
+         'w:tr/w:trPr/w:trHeight{w:val=1440, w:hRule=auto}'),
+        ('w:tr/w:trPr/w:trHeight{w:val=1440, w:hRule=auto}',
+         None,
+         'w:tr/w:trPr/w:trHeight{w:val=1440}'),
+        ('w:tr',                   None, 'w:tr/w:trPr'),
+        ('w:tr/w:trPr',            None, 'w:tr/w:trPr'),
+        ('w:tr/w:trPr/w:trHeight', None, 'w:tr/w:trPr/w:trHeight'),
+    ])
+    def height_rule_set_fixture(self, request):
+        tr_cxml, new_rule, expected_cxml = request.param
+        row = _Row(element(tr_cxml), None)
+        expected_xml = xml(expected_cxml)
+        return row, new_rule, expected_xml
+
     @pytest.fixture
     def idx_fixture(self):
         tbl = element('w:tbl/(w:tr,w:tr,w:tr)')
