Merge 498e67f into 4764f40

src/widgetastic/widget/table.py

@@ -385,7 +385,7 @@ class MyCustomTable(Table):
 
     # These tags are not added as Node objects to the table tree when
     # _process_table is called.
-    IGNORE_TAGS = ['caption']
+    IGNORE_TAGS = ['caption', 'thead', 'tfoot', 'colgroup']
 
     ROW_TAG = 'tr'
     COLUMN_TAG = 'td'

testing/test_basic_widgets.py

@@ -5,7 +5,7 @@
 
 from widgetastic.exceptions import DoNotReadThisWidget
 from widgetastic.widget import (
-    View, Table, Text, TextInput, FileInput, Checkbox, Select, ColourInput, Widget)
+    View, Table, Text, TextInput, FileInput, Checkbox, Select, ColourInput)
 from widgetastic.widget.table import TableRow
 from widgetastic.utils import Fillable, ParametrizedString, VersionPick, Version
 
@@ -345,17 +345,9 @@ class TBodyRow(TableRow):
         HIDDEN_CONTENT = "./tr[2]/td[1]"
 
         def __init__(self, parent, index, logger=None):
-            Widget.__init__(self, parent, logger=logger)
-            # We don't need to adjust index by +1 because anytree Node position will
-            # already be '+1' due to presence of 'thead' among the 'tbody' rows
-            self.index = index
+            super(TBodyRow, self).__init__(parent, index, logger=logger)
             self.hidden_content = Text(parent=self, locator=self.HIDDEN_CONTENT)
 
-        def __locator__(self):
-            # We don't need to adjust index by +1 because anytree Node position will
-            # already be '+1' due to presence of 'thead' among the 'tbody' rows
-            return self.parent.ROW_AT_INDEX.format(self.index)
-
         @property
         def is_displayed(self):
             return self.browser.is_displayed(self.ROW, parent=self)
@@ -369,16 +361,6 @@ class TBodyTable(Table):
         ROW_TAG = "tbody"
         Row = TBodyRow
 
-        @property
-        def _is_header_in_body(self):
-            """Override this to always return true.
-
-            Since we are resolving rows by the 'tbody' tag, widgetastic.Table._process_table
-            creates the rows with a position starting at 1 (because a <thead> tag is present
-            when enumerating through the <table> tag's children)
-            """
-            return True
-
     class TestForm(View):
         table1 = TBodyTable(
             '#multiple_tbody_table',