browser: standard table ignores colspan cells (#1517)

MykolaGolubyev · web-flow · commit b9e516d2ed4a · 2023-07-15T19:39:35.000-04:00
diff --git a/webtau-browser/src/main/java/org/testingisdocumenting/webtau/browser/table/BrowserTableParser.java b/webtau-browser/src/main/java/org/testingisdocumenting/webtau/browser/table/BrowserTableParser.java
@@ -85,6 +85,10 @@ private TableData parseAndBuildTable() {
     private void handleElement(Element element) {
         tableNode.setElement(element);
 
+        if (handler.ignore(tableNode)) {
+            return;
+        }
+
         if (handler.isHeaderValue(tableNode)) {
             if (parsingState == State.PARSING_BODY) {
                 throw new IllegalStateException("was already parsing body when encountered header");
diff --git a/webtau-browser/src/main/java/org/testingisdocumenting/webtau/browser/table/BrowserTableParserAGGridTableHandler.java b/webtau-browser/src/main/java/org/testingisdocumenting/webtau/browser/table/BrowserTableParserAGGridTableHandler.java
@@ -22,6 +22,11 @@ public boolean handles(String html) {
         return html.contains("ag-cell-value");
     }
 
+    @Override
+    public boolean ignore(BrowserTableNode node) {
+        return false;
+    }
+
     @Override
     public boolean isHeaderValue(BrowserTableNode node) {
         return node.attribute("class").contains("ag-header-cell-text");
diff --git a/webtau-browser/src/main/java/org/testingisdocumenting/webtau/browser/table/BrowserTableParserHandler.java b/webtau-browser/src/main/java/org/testingisdocumenting/webtau/browser/table/BrowserTableParserHandler.java
@@ -19,6 +19,8 @@
 public interface BrowserTableParserHandler {
     boolean handles(String html);
 
+    boolean ignore(BrowserTableNode node);
+
     boolean isHeaderValue(BrowserTableNode node);
 
     boolean isBodyValue(BrowserTableNode node);
diff --git a/webtau-browser/src/main/java/org/testingisdocumenting/webtau/browser/table/BrowserTableParserStandardTableHandler.java b/webtau-browser/src/main/java/org/testingisdocumenting/webtau/browser/table/BrowserTableParserStandardTableHandler.java
@@ -19,7 +19,17 @@
 public class BrowserTableParserStandardTableHandler implements BrowserTableParserHandler {
     @Override
     public boolean handles(String html) {
-        return html.contains("<thead") && html.contains("<th");
+        return (html.contains("<thead") || html.contains("<tbody")) && html.contains("<th");
+    }
+
+    @Override
+    public boolean ignore(BrowserTableNode node) {
+        String colspan = node.attribute("colspan");
+        if (colspan == null || colspan.isEmpty()) {
+            return false;
+        }
+
+        return !colspan.equals("1");
     }
 
     @Override
diff --git a/webtau-browser/src/test/groovy/org/testingisdocumenting/webtau/browser/table/BrowserTableParserTest.groovy b/webtau-browser/src/test/groovy/org/testingisdocumenting/webtau/browser/table/BrowserTableParserTest.groovy
@@ -32,4 +32,20 @@ class BrowserTableParserTest {
                                "A1" |       "B1"
                                "A2" |       "B2" }
     }
+
+    @Test
+    void "with ignored col spans"() {
+        def html = ResourceUtils.textContent("table/tax.html")
+        def table = BrowserTableParser.parse(html)
+
+        table.columnNames.should == [
+                "At least",
+                "But less than",
+                "Single or Married filing separately",
+                "Married filing jointly*",
+                "Head of a household" ]
+
+        table.row(0).values.should == ['$0', '$13', '$0', '$0', '$0']
+        table.row(3).values.should == ['50', '100', '3', '3', '3']
+    }
 }
diff --git a/webtau-browser/src/test/resources/table/standard.html b/webtau-browser/src/test/resources/table/standard.html
@@ -1,19 +1,3 @@
-<!--
-  ~ Copyright 2023 webtau maintainers
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
 <body>
 <table>
   <thead>
@@ -37,4 +21,4 @@
   </tr>
   </tbody>
 </table>
-</body>
+</body>
diff --git a/webtau-browser/src/test/resources/table/tax.html b/webtau-browser/src/test/resources/table/tax.html
diff --git a/webtau-core/src/main/java/org/testingisdocumenting/webtau/data/table/TableData.java b/webtau-core/src/main/java/org/testingisdocumenting/webtau/data/table/TableData.java
diff --git a/webtau-docs/znai/release-notes/2.1/add-2023-07-14-table-data-get-column-names.md b/webtau-docs/znai/release-notes/2.1/add-2023-07-14-table-data-get-column-names.md
