rwebspec-webdriver 0.1.2 → 0.1.3

data/CHANGELOG

@@ -1,6 +1,10 @@
 CHANGELOG
 =========
 
+== 0.1.3
+* optimize uncheck checkbox, using clear instead of click
+* optimize select_option, return after found matching option
+
 == 0.1.2
 * Remove assert_link_present_with_exact, add opts[:partial]
 * Rewrite assert_hidden, assert_enabled...

data/Rakefile

@@ -69,7 +69,7 @@ end
 spec = Gem::Specification.new do |s|
   s.platform= Gem::Platform::RUBY
   s.name = "rwebspec-webdriver"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
   s.summary = "Executable functional specification for web applications in RSpec syntax and Selenium-WebDriver"
   # s.description = ""
 
@@ -89,7 +89,7 @@ spec = Gem::Specification.new do |s|
   s.files = s.files + Dir.glob( "sample/**/*")
   s.files = s.files + Dir.glob( "docs/**/*" )
   s.add_dependency(%q<rspec>, ["= 1.1.12"])
-  s.add_dependency("selenium-webdriver", ">= 2.0.1")
+  s.add_dependency("selenium-webdriver", ">= 2.3.0")
   s.add_dependency("sanitize", ">= 2.0.0")
 end
 

data/lib/rwebspec-webdriver/web_browser.rb

@@ -519,7 +519,10 @@ module RWebSpec
         options = select_box.find_elements(:tag_name, "option")
         options.each do |opt|
           # puts opt.methods
-          opt.click if text ==  opt.text
+					if text ==  opt.text
+	          opt.click 
+						break
+					end
         end
         # select_list(:name, selectName).select(option)
       end
@@ -546,14 +549,17 @@ module RWebSpec
           values.class == Array ? arys = values : arys = [values]
           elements = find_elements(:name, checkBoxName)
           the_checkbox = elements[0] if elements.size == 1
-          if the_checkbox
-            the_checkbox.click unless the_checkbox.selected?
+          if the_checkbox && !the_checkbox.selected?
+            the_checkbox.click
             return
           end
 
           arys.each { |cbx_value|
             elements.each do |elem|
-              elem.click if elem.attribute('value') == cbx_value && !the_checkbox.selected?
+							if elem.attribute('value') == cbx_value && !the_checkbox.selected?
+	              elem.click 
+								return
+							end
             end
           }
         else
@@ -571,19 +577,24 @@ module RWebSpec
           values.class == Array ? arys = values : arys = [values]
           elements = find_elements(:name, checkBoxName)
           the_checkbox = elements[0] if elements.size == 1
-          if the_checkbox
-            the_checkbox.click if the_checkbox.selected?
+          if the_checkbox && the_checkbox.selected?
+            the_checkbox.clear 
+            # the_checkbox.click if the_checkbox.selected?
             return
           end
 
           arys.each { |cbx_value|
             elements.each do |elem|
-              elem.click if elem.attribute('value') == cbx_value && the_checkbox && the_checkbox.selected?
+							if elem.attribute('value') == cbx_value && the_checkbox && the_checkbox.selected?
+								# elem.click 
+	              elem.clear
+								break
+							end
             end
           }
         else
           the_checkbox = find_element(:name, checkBoxName)
-          the_checkbox.click if the_checkbox.selected?
+          the_checkbox.clear if the_checkbox.selected?
         end
       end
 
@@ -623,7 +634,7 @@ module RWebSpec
       def select_file_for_upload(file_field, file_path)
         is_on_windows = RUBY_PLATFORM.downcase.include?("mingw") || RUBY_PLATFORM.downcase.include?("mswin")
         normalized_file_path = is_on_windows ? file_path.gsub("/", "\\") : file_path
-        file_field(:name, file_field).set(normalized_file_path)
+				find_element(:name, file_field).set_keys(normalized_file_path)
       end
 
       def start_window(url = nil)

data/lib/rwebspec-webdriver.rb

@@ -17,7 +17,7 @@ require 'spec'
 require 'selenium-webdriver'
 
 unless defined? RWEBSPEC_VERSION
-  RWEBSPEC_VERSION = "0.1"
+  RWEBSPEC_VERSION = "0.1.3"
 end
 
 		

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rwebspec-webdriver
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Zhimin Zhan
@@ -15,18 +14,16 @@ autorequire: rwebspec-webdriver
 bindir: bin
 cert_chain: []
 
-date: 2011-07-13 00:00:00 +10:00
+date: 2011-08-11 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 1
         - 1
@@ -38,27 +35,23 @@ dependencies:
   name: selenium-webdriver
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 2
+        - 3
         - 0
-        - 1
-        version: 2.0.1
+        version: 2.3.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: sanitize
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 2
         - 0
@@ -110,27 +103,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: 
 - none
 rubyforge_project: rwebspec-webdriver
-rubygems_version: 1.4.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Executable functional specification for web applications in RSpec syntax and Selenium-WebDriver