rwebspec 4.3.4 → 4.3.5

data/CHANGELOG

@@ -1,6 +1,10 @@
 CHANGELOG
 =========
 
+4.3.5
+[Change] Add licence (MIT) into gemspec
+[Fixes] check_checkbox not working when there is hidden input with same name as checkbox
+
 4.3.4
 [Fixes] check_checkbox and uncheck_checkbox handle when more than one matching element
 

data/Rakefile

@@ -78,7 +78,7 @@ end
 spec = Gem::Specification.new do |s|
   s.platform= Gem::Platform::RUBY
   s.name = "rwebspec"
-  s.version = "4.3.4"
+  s.version = "4.3.5"
   s.summary = "Web application functional specification in Ruby"
   s.description = "Executable functional specification for web applications in RSpec syntax with Watir or Selenium"
 
@@ -86,7 +86,8 @@ spec = Gem::Specification.new do |s|
   s.email   = "zhimin@agileway.com.au"
   s.homepage= "http://github.com/zhimin/rwebspec/tree/master"
   s.rubyforge_project = "rwebspec"
-
+  s.licenses = ["MIT"]
+  
   s.has_rdoc    = true
   s.requirements << 'none'
   s.require_path    = "lib"

data/lib/rwebspec-webdriver/web_browser.rb

@@ -579,47 +579,43 @@ module RWebSpec
       #   check_checkbox("agree")
       #   check_checkbox("agree", "true")
       def check_checkbox(checkBoxName, values=nil)
+        elements = find_checkboxes_by_name(checkBoxName)
         if values
-          values.class == Array ? arys = values : arys = [values]
-          elements = find_elements(:name, checkBoxName)
-          the_checkbox = elements[0] if elements.size > 0
-          if the_checkbox
-            the_checkbox.click unless the_checkbox.selected?
-            return
-          end
-
+          values.class == Array ? arys = values : arys = [values]          
           arys.each { |cbx_value|
             elements.each do |elem|
               elem.click if elem.attribute('value') == cbx_value && !elem.selected?
             end
           }
         else
-          the_checkbox = find_element(:name, checkBoxName)
+          the_checkbox = elements[0] 
           the_checkbox.click unless the_checkbox.selected?
         end
       end
+      
+      def find_checkboxes_by_name(checkBoxName)
+        elements = find_elements(:name, checkBoxName)
+        elements.reject! {|x| x.tag_name != "input" ||  x["type"] != "checkbox"} 
+        raise "No checkbox with name #{checkBoxName} found" if elements.empty?
+        return elements
+      end
 
       # Uncheck a checkbox
       # Usage:
       #   uncheck_checkbox("agree")
       #   uncheck_checkbox("agree", "false")
       def uncheck_checkbox(checkBoxName, values = nil)
+        elements = find_checkboxes_by_name(checkBoxName)
+        
         if values
-          values.class == Array ? arys = values : arys = [values]
-          elements = find_elements(:name, checkBoxName)
-          the_checkbox = elements[0] if elements.size > 0
-          if the_checkbox
-            the_checkbox.click if the_checkbox.selected?
-            return
-          end
-
+          values.class == Array ? arys = values : arys = [values]          
           arys.each { |cbx_value|
             elements.each do |elem|
-              elem.click if elem.attribute('value') == cbx_value && elem && elem.selected?
+              elem.click if elem.attribute('value') == cbx_value && elem.selected?
             end
           }
         else
-          the_checkbox = find_element(:name, checkBoxName)
+          the_checkbox = elements[0] 
           the_checkbox.click if the_checkbox.selected?
         end
       end

data/lib/rwebspec.rb

@@ -16,7 +16,7 @@ end
 require 'rspec'
 
 unless defined? RWEBSPEC_VERSION
-  RWEBSPEC_VERSION = RWEBUNIT_VERSION = "4.3.4"
+  RWEBSPEC_VERSION = RWEBUNIT_VERSION = "4.3.5"
 end
 
 $testwise_polling_interval = 1 # seconds

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rwebspec
 version: !ruby/object:Gem::Version
-  version: 4.3.4
+  version: 4.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: rwebspec
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -143,7 +143,8 @@ files:
 - lib/rwebspec-webdriver/web_browser.rb
 - lib/rwebspec.rb
 homepage: http://github.com/zhimin/rwebspec/tree/master
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: