pickles 0.1.12 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67d811b15d2ba4b98a659537383cc987a9427d5e
-  data.tar.gz: be4c82f13dbfa6efa300ab8e844ddf0bd5e5f296
+  metadata.gz: 6b246c85cb90145f058da79dac65a4826dce3c1f
+  data.tar.gz: ec1754a3f0fc0bb06c87624d76152a19afb4a5a7
 SHA512:
-  metadata.gz: 23913ff9c5bf8e8e82965e70f29c88d8b26fa36ac0c5db70f4d210e0194152a4e3cc93fbf47ec4ea66385869bb363fb7e88d4e37e0358be53ea25388d67ac1a2
-  data.tar.gz: 9c033d6bc6bd0de0df2e4f9aa44f6d7824554d3f0900aaac033dbcea74b7a7a680d2e2a47d0f106934e7eb5be64496b598e9a09b185d631f8a66d7165bacb8da
+  metadata.gz: 16ac3a5fb9385eb4278d1ca43ed330072e10438bde2779b23f43532e75dd77831802a9ff044f276c1f9241ef30611fb9128a7c33ee04fe5043c3d24fabe01d86
+  data.tar.gz: b6f4f774eadf120d651b9047d193b215734023f2aa29837884d5daddfac46797c6a27354980e34513cc0621c82eeb50681d8bf7e6a99d06161994f84af874014

data/lib/cucumber/pickles/config.rb

@@ -22,7 +22,7 @@ class Pickles::Config
     @css_node_map = {}
     @log_xhr_response = false
     @xpath_node_map = {}
-    @fill_tag_steps_map = { 'select' => FillIN::Select }
+    @fill_tag_steps_map = { 'select' => FillIN::Select, 'jselect' => FillIN::JsSelect }
     @check_tag_steps_map = { 'text' => CheckIn::Text }
   end
 

data/lib/cucumber/pickles/fill_in.rb

@@ -4,6 +4,7 @@ module FillIN
 
   autoload :Factory, _dir + 'factory'
   autoload :Input, _dir + 'input'
+  autoload :JsSelect, _dir + 'js_select'
   autoload :Select, _dir + 'select'
   autoload :ComplexInput, _dir + 'complex_input'
 

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

@@ -64,6 +64,31 @@ module NodeFinders
     end
   end
 
+  #
+  # try to guess which of the above 2 methods should be used
+  #
+  def guess_node(within_string, within: nil)
+    is_find_node_case = within_string[0] == "\"" && within_string[-1] == "\""
+
+    match = Helpers::Regex::WITHIN.match(within_string)
+    is_detect_node_case = !match.nil?
+
+    if is_detect_node_case
+      captures = match.captures
+      el_alias = captures[0]
+      locator = captures[1]
+
+      detect_node(el_alias, locator, within: within)
+    elsif is_find_node_case
+      within_string[0]  = ''
+      within_string[-1] = ''
+
+      find_node(within_string, within: within)
+    else
+      fail "Incorrect within def"
+    end
+  end
+
   #
   # Similar to find_node, but looking for fillable fields for this cases:
   #  1. label or span(as label) with input hint for input || textarea || @contenteditable

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

@@ -1,6 +1,6 @@
 # :nodoc:
 module Helpers::Regex
 
-  WITHIN = /\A\s*(.*)?\s*(?:["|'](.*?)["|'])?\s*\Z/
+  WITHIN = /^\s*(.*?)?\s*(?:["|'](.*?)["|'])?\s*$/
 
 end

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

@@ -5,16 +5,18 @@
 #   | .note          | Nice guy   |
 #
 
-Then(/^I can(not)? see:$/) do |is_not, table|
+Then(/^I can(not)? see:( within (?:.*))?$/) do |is_not, within_block, table|
+  within_block ||= page
+
   if is_not
     check = -> within, content {
-      within = within.strip.present? ? find_node(within) : page
+      within = within.strip.present? ? Pickles.guess_node(within, within: within_block) : within_block
 
       expect(within).not_to have_content(content)
     }
   else
     check = -> within, content {
-      within = within.strip.present? ? find_node(within) : page
+      within = within.strip.present? ? Pickles.guess_node(within, within: within_block) : within_block
 
       expect(within).to have_content(content)
     }

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

@@ -61,7 +61,11 @@ When /^(?:|I )(fill|select)(?: "([^"]*)")?(?: with "([^"]*)")?( within (?:.*))?$
   Waiter.wait_for_ajax
 
   if type == 'select' && value.present?
-    FillIN::Select.new(labels, value, within).call
+    begin
+      FillIN::Select.new(labels, value, within).call
+    rescue Capybara::ElementNotFound
+      FillIN::JsSelect.new(labels, value, within).call
+    end
   else
     labels.split(/\s*\|\s*/).each do |label|
       FillIN::Factory.new(label, value, within: within).call.call

data/lib/cucumber/pickles/steps/fill_in/js_select.rb

@@ -0,0 +1,32 @@
+class FillIN::JsSelect
+
+  def initialize(label, value, within)
+    @label = label
+    @value = value
+    @within = within || Capybara.current_session
+  end
+
+  def call
+    input = FillIN::Input.new(@label, @value, @within).call
+
+    locator, index = Locator::Index.execute(@value)
+    locator, xpath = Locator::Equal.execute(locator)
+
+    index ||= 1
+
+    Waiter.wait do
+      input.find(:xpath, "./ancestor::*[#{xpath}][#{index}]/#{xpath}").click
+    end
+
+    Pickles.blur(input)
+
+    Waiter.wait_for_ajax
+
+    input
+  end
+
+  private
+
+  attr_reader :label, :value
+
+end

data/lib/cucumber/pickles/steps/fill_in/select.rb

@@ -1,3 +1,7 @@
+# When /^select "(.*)" from "(.*)"$/ do |value, label|
+#   select value, from: label
+# end
+
 class FillIN::Select
 
   def initialize(label, value, within)
@@ -7,20 +11,12 @@ class FillIN::Select
   end
 
   def call
-    input = FillIN::Input.new(@label, @value, @within).call
-
-    text, selector = NodeTextLookup.lookup_values(value)
-    item_xpath = selector.(text)
-
-    Waiter.wait do
-      input.find(:xpath, "./ancestor::*[#{item_xpath}][1]/#{item_xpath}").click
-    end
-
-    Pickles.blur(input)
+    locator, wait = Locator::Wait.execute(@label)
 
-    Waiter.wait_for_ajax
+    options = { from: locator }
+    options[:wait] = wait if wait
 
-    input
+    @within.select @value, options
   end
 
   private

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

@@ -1,3 +1,9 @@
 When 'I go back' do
   page.evaluate_script('history.back()')
 end
+
+And(/^visit "(.*)"$/) do |url|
+  visit url
+
+  Waiter.wait_for_ajax
+end

data/lib/cucumber/pickles/transform.rb

@@ -1,9 +1,6 @@
-within_reg = /\A\s*(.*)?\s*(?:["|'](.*?)["|'])?\s*\Z/
-
 transformation = -> (within_info) do
   splitted = within_info.split('within').reject(&:blank?)
 
-
   splitted.reverse_each.inject(page) do |within, info|
     captures = Helpers::Regex::WITHIN.match(info).captures
     el_alias = captures[0]

data/lib/cucumber/pickles/version.rb

@@ -1,3 +1,3 @@
 module Pickles
-  VERSION = "0.1.12"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pickles
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.2.0
 platform: ruby
 authors:
 - vs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-05 00:00:00.000000000 Z
+date: 2017-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -114,6 +114,7 @@ files:
 - lib/cucumber/pickles/steps/fill_in/complex_input.rb
 - lib/cucumber/pickles/steps/fill_in/factory.rb
 - lib/cucumber/pickles/steps/fill_in/input.rb
+- lib/cucumber/pickles/steps/fill_in/js_select.rb
 - lib/cucumber/pickles/steps/fill_in/select.rb
 - lib/cucumber/pickles/steps/redirect.rb
 - lib/cucumber/pickles/transform.rb