chop 0.36.5 → 0.36.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 580959eb5a8d18eadb47078793c58b977c0d3310029b586b55db825cb70c9c0b
-  data.tar.gz: 172bec5372e5a2d4456ebe6648397e89a6a08a316104935826e51d2075ca01c1
+  metadata.gz: a4d477e3610880a15f5ab315ad6c2f3a212f28f443147e363edc79508c7316b8
+  data.tar.gz: c0cdf43b5a9415e21216d1ed4babddee3a141d9651bf593d6ffac484b1d1140c
 SHA512:
-  metadata.gz: 9a3a9888fac132c449dc50767a507497e4089632e356e30a409197e34b9ba02e383237f3d5d395fa54028f82bc9776652590eb1f705e5a92d3a513eb45819faa
-  data.tar.gz: 6b07b6f679ec9ed24c9956604ff2831485d84497bbb33b13fafe6e85d9e46dd6c56191d55a9ea8cb1a66940abf5e97a5cb01b85cef4146b88f1d4428001345a9
+  metadata.gz: e3c86c9f999bdb1c9b2cbb8c721affa85008ae8cd65947311d182bdd1c5923d0aeedd14f4e2e75a6820c211a7e477a599e18628c2230c26dc6ef75530728d6ec
+  data.tar.gz: e51e524727d4a813a0e19756fdc9c82a389e2e30404eac8de13fd7f512fd4edf218ca96787b5c9a63e56e2dc2557115add2851cb2d408adfc0c6399de35e4185

data/lib/chop/diff.rb

@@ -8,7 +8,7 @@ module Chop
   class Diff < Struct.new(:selector, :table, :session, :timeout, :block)
     def self.diff! selector, table, session: Capybara.current_session, timeout: Capybara.default_max_wait_time, errors: [], **kwargs, &block
       errors += session.driver.invalid_element_errors
-      errors += [Capybara::ElementNotFound, Cucumber::MultilineArgument::DataTable::Different]
+      errors += [Cucumber::MultilineArgument::DataTable::Different]
       session.document.synchronize timeout, errors: errors do
         new(selector, table, session, timeout, block).diff! **kwargs
       end

data/lib/chop/dsl.rb

@@ -9,19 +9,16 @@ module Chop
     end
 
     def diff! selector, table, session: Capybara.current_session, as: nil, timeout: nil, **kwargs, &block
-      sync_timeout = timeout || Capybara.default_max_wait_time
       class_name = if as
         as.to_s
       elsif selector.respond_to?(:tag_name)
         selector.tag_name
       else
-        session.document.synchronize sync_timeout, errors: session.driver.invalid_element_errors do
-          session.find(selector).tag_name
-        end
+        session.find(selector).tag_name
       end.camelize
       klass = const_get("Chop::#{class_name}")
       kwargs[:session] = session
-      kwargs[:timeout] = timeout if timeout
+      kwargs[:timeout] = timeout if timeout.present?
       klass.diff! selector, table, **kwargs, &block
     end
 

data/lib/chop/form.rb

@@ -7,34 +7,26 @@ module Chop
       new(table, session, path).fill_in!
     end
 
-    def self.diff! selector, table, session: Capybara.current_session, timeout: Capybara.default_max_wait_time, &block
-      errors = session.driver.invalid_element_errors + [Capybara::ElementNotFound, Cucumber::MultilineArgument::DataTable::Different]
-      session.document.synchronize timeout, errors: errors do
-        root = begin
-          if selector.is_a?(Capybara::Node::Element)
-            selector
-          else
-            session.find(selector, wait: timeout)
-          end
-        rescue Capybara::ElementNotFound
-          raise unless @allow_not_found
-          Node("")
+    def self.diff! selector, table, session: Capybara.current_session, &block
+      root = begin
+        if selector.is_a?(Capybara::Node::Element)
+          selector
+        else
+          session.find(selector)
         end
+      rescue Capybara::ElementNotFound
+        raise unless @allow_not_found
+        Node("")
+      end
 
-        actual = root.all(Field.combined_css_selector, allow_reload: true)
-          .filter_map { |field_element| Field.from(session, field_element) }
-          .select(&:should_include_in_diff?)
-          .uniq { |field| field.field[:name] }
-          .filter_map(&:to_diff_row)
+      actual = root.all(Field.combined_css_selector, allow_reload: true)
+        .filter_map { |field_element| Field.from(session, field_element) }
+        .select(&:should_include_in_diff?)
+        .uniq { |field| field.field[:name] }
+        .filter_map(&:to_diff_row)
 
-        # Retry if form fields haven't loaded yet (e.g., turbo-frame still loading)
-        if actual.empty? && !table.raw.flatten.empty?
-          raise Capybara::ElementNotFound, "No form fields found in #{selector.inspect}"
-        end
-
-        block.call(actual, root) if block_given?
-        table.diff! actual, surplus_row: false, misplaced_col: false
-      end
+      block.call(actual, root) if block_given?
+      table.diff! actual, surplus_row: false, misplaced_col: false
     end
 
 
@@ -54,15 +46,13 @@ module Chop
         return nil if locator.nil?
 
         @locator = locator.to_s
-        @session.document.synchronize(Capybara.default_max_wait_time, errors: [Capybara::ElementNotFound]) do
-          @all_fields = @session.all(@css_selector, minimum: 1, wait: 0)
-
-          find_by_direct_attributes ||
-          find_by_aria_label ||
-          find_by_associated_label ||
-          find_by_wrapping_label ||
-          raise_not_found
-        end
+        @all_fields = @session.all(@css_selector)
+
+        find_by_direct_attributes ||
+        find_by_aria_label ||
+        find_by_associated_label ||
+        find_by_wrapping_label ||
+        raise_not_found
       end
 
       private

data/lib/chop/version.rb

@@ -1,3 +1,3 @@
 module Chop
-  VERSION = "0.36.5"
+  VERSION = "0.36.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chop
 version: !ruby/object:Gem::Version
-  version: 0.36.5
+  version: 0.36.6
 platform: ruby
 authors:
 - Micah Geisel