match_table 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77cc25bced0a709998c9d0f308811a3c0c339838082172d2c48e64191bbd72b7
-  data.tar.gz: 69b3cb5768b9c6c1a0791b3fec61ce6bb2b18d3158990f713902e5d15df07ca5
+  metadata.gz: 318e51a75753d999304e5a8c93a9eee0e71c1ed9eaa08ee804dfffa9bba74c02
+  data.tar.gz: 34480da0ff98a9aa86b728c7b5cd458cd8a8d7f74d5770036f625410dc926010
 SHA512:
-  metadata.gz: ead9964e2f6d2338ec86963d66a30cb0d3bf0a343bf0a0cbfa3625222b76903c73afc9aa943e45a7d6b2f9eab2827099419e36fa809263c49f6d31be5e9521e2
-  data.tar.gz: 853b507440493137c1df8e7d770b6fde5cd72a11f3ca71b2b215bb619d28ecbe2f4bafd9269a209c7f2637475d281f8f1c20d1cb106f3f9a4a56072084a42d2b
+  metadata.gz: 75606e33fd7e0a64726484d93259c6753b8655bbe69e8a7f869ea055a8e095ce1238d7c886d6792ed71c360925975f7d3a8fc6e6fb048a58fef7d6b9d20ac769
+  data.tar.gz: e3f7ce2500136ed5b189504b079c3beb34ad119f81fbc36c65a206a369a7e75d6e3104d45bd7be53b129bc86ceadf446c51e9b04c442b63e67d40838f161e251

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## [Unreleased]
 
+## [1.3.0] - 2026-01-16
+
+- Match on entire header instead of prefix (#3)
+
+## [1.2.0] - 2025-11-18
+
+- Rework hidden header support (#2)
+- Fix an issue where match_table could eat failures (#2)
+
+## [1.1.0] - 2025-09-29
+
+- Include hidden headers if they have a child with data-role (#1)
+
 ## [1.0.0] - 2025-04-15
 
 - Initial release

data/Rakefile

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 require "standard/rake"
 
-task default: :standard
+RSpec::Core::RakeTask.new(:spec)
+
+task default: [:spec, :standard]

data/lib/match_table/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MatchTable
-  VERSION = "1.1.0"
+  VERSION = "1.3.0"
 end

data/lib/match_table.rb

@@ -24,15 +24,15 @@ RSpec::Matchers.define :match_table do |table|
 
     raise ArgumentError, "all rows must have the same headers" unless same_headers
 
-    begin
-      # We'll rerun this block until our expectations are met or we time out.
-      synchronize do
-        @failures = []
+    # We'll rerun this block until our expectations are met or we time out.
+    synchronize do
+      @failures = []
+      begin
         find_elements_on_page
 
         header_positions =
           expected_headers.each_with_object({}) do |header, hash|
-            position = @actual_headers.find_index { |actual_header| actual_header.start_with?(header) }
+            position = @actual_headers.find_index { |actual_header| actual_header == header }
             unless position.nil?
               hash[header] = position
             end
@@ -42,27 +42,30 @@ RSpec::Matchers.define :match_table do |table|
         @actual_rows.each do |actual_row|
           matched_rows << match_row(header_positions:, actual_row:)
         end
+      rescue Capybara::ExpectationNotMet => e
+        raise "Internal match_table error: #{e.message}"
+      end
 
-        @actual = matched_rows
-        @expected_as_array = Array(@expected_rows)
+      @actual = matched_rows
+      @expected_as_array = Array(@expected_rows)
 
-        # Grab the failures from these expectations so we can use their failure messages
-        RSpec::Support.with_failure_notifier(append_to_failures_array_notifier) do
-          case @mode
-          when :exact
-            expect(actual).to eq(expected_as_array)
-          when :include
-            expect(actual).to include(*expected_as_array)
-          end
+      # Grab the failures from these expectations so we can use their failure messages
+      RSpec::Support.with_failure_notifier(append_to_failures_array_notifier) do
+        case @mode
+        when :exact
+          expect(actual).to eq(expected_as_array)
+        when :include
+          expect(actual).to include(*expected_as_array)
         end
-
-        raise Capybara::ExpectationNotMet unless @failures.empty?
       end
-    rescue Capybara::ExpectationNotMet
-      false
+
+      # raise to signal to synchronize that we need to retry
+      raise Capybara::ExpectationNotMet unless @failures.empty?
     end
 
     @failures.empty?
+  rescue Capybara::ExpectationNotMet
+    false
   end
 
   # Match the table exactly with the provided rows in order.
@@ -108,17 +111,27 @@ RSpec::Matchers.define :match_table do |table|
     table = find_table(@table)
 
     @actual_headers =
-      table.find("thead").all("th").map(&:text).compact_blank
+      table.find("thead").all("th", visible: :all).map do |element|
+        text = element.text
+        if text.nil? || text.empty?
+          text = element.first("[data-role]", visible: :all, minimum: 0)&.text(:all) || ""
+        end
 
-    @actual_headers +=
-      table.find("thead").all("th", visible: :hidden).map do |element|
-    element.first("[data-role]").text(:all)
-      end.compact_blank
+        normalize_header_text(text)
+      end
 
     @actual_rows = []
 
-    rows = table.find("tbody:not(.contents)").all("tr[data-table-target='row']:not([data-accordion-content] table tr)").presence ||
-      table.find("tbody:not(.contents)").all("tr[data-table-target='row']")
+    tbody = table.find("tbody:not(.contents)")
+    rows = tbody.all("tr[data-table-target='row']")
+
+    # Filter out rows that are inside accordion content of table rows
+    # Only reject rows that are inside a tr[data-accordion-content] that is within this specific table
+    rows = rows.reject do |row|
+      row.ancestor("tr[data-accordion-content]", minimum: 0)
+    rescue Capybara::ElementNotFound
+      false
+    end
 
     rows.each do |row|
       cells = row.all("td")
@@ -132,6 +145,15 @@ RSpec::Matchers.define :match_table do |table|
     end
   end
 
+  def normalize_header_text(text)
+    return text if text.nil? || text.empty?
+
+    text
+      .gsub(/arrow_drop_(up|down)/, "")
+      .gsub(/\s+/, " ")
+      .strip
+  end
+
   def append_to_failures_array_notifier
     lambda { |failure, _opts| @failures << failure }
   end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: match_table
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Ryan Schlesinger
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-29 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
@@ -60,7 +59,6 @@ metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/detaso/match_table
   source_code_uri: https://github.com/detaso/match_table
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -75,8 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Adds a `match_table` matcher for your Capybara system specs.
 test_files: []