pickles 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b746089e7f029550a9e14d08b69364b0c50d0ac7
-  data.tar.gz: 825badd42378c243944baec9593407ea1ae8463b
+  metadata.gz: 133b4adeb408fceb495f86eaa9331e277bb4c684
+  data.tar.gz: 11b8af9c0ff9438bcd04f96960beafee5d9b3f37
 SHA512:
-  metadata.gz: 0cb28a5d19919cb9b0213bebc6a40c1e93242323e0a49795e5e0ac808a307d06ad4e6c8ba7c42281e33f4aace0c419ded5355d06369fe67bd03203dc6c1ed16c
-  data.tar.gz: ec85c96a5f7924d10cc5d017bab1be715c2a3035665444705437d9fc9d672e177f9d6f992acd709cb972a19868ba7ae563b8159f71e49a85189d0ce9eec5806d
+  metadata.gz: f4254e7ac1c0c28bfc235d30791db7016d2087e2440fed0dbc849705577cc932844e71b4a51b10b20b1f73a156d2f62d12c82672dc2e695613ba133a72607f79
+  data.tar.gz: 7bb8bf6bb981989c6e56f4ea42d2feb4f88c744db9ea096a67d76b7e261cc5f05541ea7945b25509bedebc6e6dc117383b2e8b59860147ae69e1efae6e3e7d74

data/lib/cucumber/pickles/helpers/node_finders.rb

@@ -13,14 +13,21 @@ module NodeFinders
   def find_node(locator, within: nil)
     within ||= Capybara.current_session
 
+    options = { visible: false }
+
     locator, index = Locator::Index.execute(locator)
+    locator, wait  = Locator::Wait.execute(locator)
     locator, xpath = Locator::Equal.execute(locator)
 
     if index
       xpath = "(#{xpath})[#{index}]"
     end
 
-    _rescued_find([:xpath, xpath, wait: 0, visible: false], locator, within: within, message: "find_node") do
+    if wait
+      options[:wait] = wait
+    end
+
+    _rescued_find([:xpath, xpath, options], locator, within: within, message: "find_node") do
       raise Capybara::ElementNotFound,
             "Unable to find node by locator #{locator}",
             caller

data/lib/cucumber/pickles/helpers/waiter.rb

@@ -124,12 +124,12 @@ module Waiter
 
   module_function
 
-  def wait
+  def wait(errors = [Capybara::ElementNotFound])
     wait_for_ajax
 
     return unless block_given?
 
-    page.document.synchronize do
+    page.document.synchronize(Capybara.default_max_wait_time, errors: errors) do
       yield
     end
   end

data/lib/cucumber/pickles/steps/click.rb

@@ -1,32 +1,22 @@
-def wait_flags(text)
-  if text.starts_with?('>')
-    text = text[1..-1]
-
-    Waiter.wait_for_ajax
-
-    js_wait = true
-  end
-
-  if text.ends_with?('>')
-    text = text.chomp('>')
-
-    ajax_wait = true
-  end
-
-  [js_wait, text, ajax_wait]
-end
-
 def trigger(text, event, within)
 
-  js_wait, text, ajax_wait = wait_flags(text)
+  locator, wait_time = Locator::Wait.execute(text)
 
-  if js_wait
-    Waiter.wait { Pickles.find_node(text, within: within).public_send(event) }
+  if wait_time.nil? || wait_time > 0
+    Waiter.wait do
+      Pickles.trigger(
+        Pickles.find_node(text, within: within),
+        event
+      )
+    end
   else
-    Pickles.find_node(text, within: within).public_send(event)
+    Pickles.trigger(
+      Pickles.find_node(text, within: within),
+      event
+    )
   end
 
-  Waiter.wait_for_ajax if ajax_wait
+  Waiter.wait_for_ajax
 
 end
 
@@ -53,8 +43,6 @@ When /^I (?:click|navigate) "([^"]*)"( within (?:.*))?$/ do |click_text, within|
   Waiter.wait_for_ajax
 
   click_text.split(/,|->/).each do |text|
-    pry binding if text['pry']
-
     trigger(text, 'click', within)
   end
 
@@ -70,7 +58,6 @@ end
 #
 When /^I (?:click|navigate):( within (?:.*))?$/ do |within, table|
   do_click = -> (event, text) do
-    pry binding if text['pry']
     event = 'click' if event.strip.blank?
 
     trigger(text, event, within)

data/lib/cucumber/pickles/version.rb

@@ -1,3 +1,3 @@
 module Pickles
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pickles
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - vs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2017-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara