web4cucumber 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73cd68b1548d1653412dac11675eff0e1f47c50c
-  data.tar.gz: 3be0f48e3462862711fa4d473ea9fe6d1141d47e
+  metadata.gz: 09f2ae8b4f38c4ce225c93a487a25e6c30d2dd6c
+  data.tar.gz: 5099fd51931bc779bd8fac847b47791036b28995
 SHA512:
-  metadata.gz: bdf0b758d5dfc32be4d32c44104b7f5ddea281cfdf06cdc01234ad3d5b82b4c8306676f2be907cea3f93d2e2c6e5d78ef0f4041b30b57c3eee71f15f640fcf1c
-  data.tar.gz: 032a4a7c1bd560fdd6da51d61abebbb9d035a4cf1f9949ff3c7603df23b4126e58e776c7f89590b29d2df3c5b4099629c48ec1399fa544b60df6cde51c1d6ed9
+  metadata.gz: 58b42e5b1452ba7bf297b4f393719529c6231e2da1b3b511c454e8474666ec23e1fb469c763d352ed9bc73f8c7bd86b4333f026a864248c0bdc3c68f3a88515a
+  data.tar.gz: 20f5be395473dc40e1f0b8d26d71772a7fd85a894dea7d58d3695c31fad4bd63bb10118bbfb28c95e6f924ed9c0d2caaed04ae404e2d051e52e7f9fd6196c4d7

data/lib/web4cucumber.rb

@@ -118,7 +118,10 @@ class Web4Cucumber
   end
 
   def run_action(key, options)
-    @result = {:result=>true, :failed_positive_checkpoints=>[], :failed_negative_checkpoints=>[], :errors => []}
+    @result = {:result=>true,
+               :failed_positive_checkpoints=>[],
+               :failed_negative_checkpoints=>[], 
+               :errors => []}
     @@rules.freeze
     rules = Marshal.load(Marshal.dump(@@rules))
     action_rules = rules[key.to_sym]
@@ -196,16 +199,17 @@ class Web4Cucumber
       if page_rules.has_key? :expected_fields
         page_rules[:expected_fields].each_pair { |name, prop|
           # Beginning of page fields
-          # The following allows you to put <value> as a selector value
+          # You can use anyone of provided options as a part of selector
+          # string. For example
           # :select_item:
           #   :selector:
-          #     :text: 'Some text <value>'
-          # and then pass the value in options
-          prop[:selector].each do |propkey, propval|
-            if propval.match Regexp.new("<value>")
-              prop[:selector][propkey] = propval.gsub('<value>', options[name])
+          #     :text: 'Some text <passme>'
+          # Do not forget to pass :passme key with value in options hash
+          options.keys.each do |optkey|
+            if prop[:selector].values[0].include? "<#{optkey}>"
+              prop[:selector].values[0].gsub!("<#{optkey}>", options[optkey])
             end
-          end          
+          end
           possible_elements = {
             # There could be more than one element with the same
             # properties and only one would be visible. As an example:
@@ -263,7 +267,7 @@ class Web4Cucumber
               end
             end
             if not element
-              if not prop[:may_absent]
+              if not prop[:may_absent] and not page_rules.has_key? :may_absent
                 @result[:result] = false
                 @result[:errors] << "Unable to find element #{name.to_s} by the following #{prop[:selector].keys[0].to_s}: #{prop[:selector].values[0]}"
               end
@@ -371,12 +375,22 @@ class Web4Cucumber
             end
             button.click
           rescue Exception => e
-            @result[:result]=false
-            @result[:errors] << e.message
-            screenshot_save
+            unless page_rules.has_key? :may_absent
+              @result[:result]=false
+              @result[:errors] << e.message
+              screenshot_save
+            end
           end
         elsif page_rules[:commit].has_key?(:type) and page_rules[:commit][:type] == 'alert'
-          @@b.alert.ok
+          begin
+            @@b.alert.ok
+          rescue Exception => e
+            unless page_rules.has_key? :may_absent
+              @result[:result]=false
+              @result[:errors] << e.message
+              screenshot_save
+            end
+          end
         else
           raise "Please provide selector for #{page} page commit"
         end
@@ -418,7 +432,7 @@ class Web4Cucumber
       The initialize method needs to know at least the base_url you want to test against and the :rules_path - path
       to the folder where you store your yaml files with action descriptions. Other keys are optional"
     end
-    if options.keys & obligatory_options == obligatory_options
+    if (options.keys & obligatory_options).sort == obligatory_options.sort
       @@base_url = options[:base_url]
       @@rules_path = options[:rules_path]
       @@logger = options[:logger]
@@ -453,6 +467,7 @@ class Web4Cucumber
       proxy = ENV["http_proxy"].scan(/[\w\.\d\_\-]+\:\d+/)[0] # to get rid of the heading "http://" that breaks the profile
       firefox_profile.proxy = chrome_profile.proxy = Selenium::WebDriver::Proxy.new({:http => proxy, :ssl => proxy})
       firefox_profile['network.proxy.no_proxies_on'] = "localhost, 127.0.0.1"
+      chrome_switches = %w[--proxy-bypass-list=127.0.0.1]
       ENV['no_proxy'] = '127.0.0.1'
     end
     client = Selenium::WebDriver::Remote::Http::Default.new
@@ -460,7 +475,7 @@ class Web4Cucumber
     if browser == :firefox
       @@b = Watir::Browser.new browser, :profile => firefox_profile, :http_client=>client
     elsif browser == :chrome
-      @@b = Watir::Browser.new browser, desired_capabilities: chrome_profile
+      @@b = Watir::Browser.new browser, desired_capabilities: chrome_profile, switches: chrome_switches
     else
       raise "Not implemented yet"
     end
@@ -723,4 +738,25 @@ class Web4Cucumber
   def action_rules(action)
     return @@rules[action.to_sym]
   end
+
+  def checkbox_check(element, negate)
+    result = {:result => true,
+              :failed_positive_checkpoints => [],
+              :errors => []
+    }
+    begin
+      if negate
+        @@b.checkbox(element).clear
+      else
+        @@b.checkbox(element).set
+      end
+    rescue => e
+      result[:result] = false
+      result[:failed_positive_checkpoints] << element
+      result[:errors] << e.message
+    end
+    return result
+  end
+
 end
+

data/lib/web4cucumber/version.rb

@@ -1,3 +1,3 @@
 module Web4Cucumber
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web4cucumber
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Oleg Fayans
@@ -102,6 +102,12 @@ files:
 - examples/testproject/lib/web/login.yaml
 - lib/web4cucumber.rb
 - lib/web4cucumber/version.rb
+- pkg/web4cucumber-0.0.1.gem
+- pkg/web4cucumber-0.0.2.gem
+- pkg/web4cucumber-0.0.3.gem
+- pkg/web4cucumber-0.0.4.gem
+- pkg/web4cucumber-0.0.5.gem
+- pkg/web4cucumber-0.0.6.gem
 - web4cucumber.gemspec
 homepage: https://github.com/ofayans/web4cuke
 licenses: