chop 0.36.3 → 0.36.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c9309eaa197ef082657cdc752f144e8cee2b37a94a97683e23fb2d92c96a5d2
-  data.tar.gz: 99e850713c1f56868b99a3278f9aca1b72f40d21a234f2c41edf62ea0b20d1fe
+  metadata.gz: 19a97995362b42188ac79605c570ed798eed9f4ba01c56a6b4387e7c5db867a0
+  data.tar.gz: ece8d02c45238cba9ded650e2bd73c4af589c5e876aa1de13c582bb38d31002c
 SHA512:
-  metadata.gz: dbea44a9d7a0abda97759806cf01d270e4fa2ce09cdc0e0ed7ba05bd8d76004f2c5363bcb186c38f2d43833eaeb48b1f6f9e41b564a8d6379a5ba23e9f59198c
-  data.tar.gz: 79726b3042667c3a3cacdf61ed3f47a374285a26b8a15a68a3865abf9f5222dd57e06fbf321fed3ad45f8aabc677b131b1e22c5618b2d5d5fdb0df63c0ce4c41
+  metadata.gz: d74cb08a00ba8856d556f5073cb5d0223b94ab09de5e91fabf28c3c73b77fbf770399973f7b111f7ef854e5070ff85be31ad21c3be884cc81d79b590389bbe3f
+  data.tar.gz: 58b17b7b79f662750bad471fcb46ee9aa7f8675f53e5e5eafafce409cfd6a09152f77b831b56048a9f0b8fdf54d8c873c61ae575c7a28331ca6fba5b53e18e38

data/lib/chop/dsl.rb

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

data/lib/chop/form.rb

@@ -7,26 +7,34 @@ module Chop
       new(table, session, path).fill_in!
     end
 
-    def self.diff! selector, table, session: Capybara.current_session, &block
-      root = begin
-        if selector.is_a?(Capybara::Node::Element)
-          selector
-        else
-          session.find(selector)
+    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("")
         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)
 
-      block.call(actual, root) if block_given?
-      table.diff! actual, surplus_row: false, misplaced_col: false
+        # 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
     end
 
 

data/lib/chop/version.rb

@@ -1,3 +1,3 @@
 module Chop
-  VERSION = "0.36.3"
+  VERSION = "0.36.4"
 end

metadata

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