rwebspec-webdriver 0.1.5 → 0.2

data/CHANGELOG

@@ -1,6 +1,9 @@
 CHANGELOG
 =========
 
+== 0.2
+* Deprecate try method, use try_until instead
+
 == 0.1.5
 * Support TestWise 2
 

data/Rakefile

@@ -69,9 +69,9 @@ end
 spec = Gem::Specification.new do |s|
   s.platform= Gem::Platform::RUBY
   s.name = "rwebspec-webdriver"
-  s.version = "0.1.5"
+  s.version = "0.2"
   s.summary = "Executable functional specification for web applications in RSpec syntax and Selenium-WebDriver"
-  s.description = "Alternative web test syntax on top of Selenium-WebDriver"
+  # s.description = ""
 
   s.author  = "Zhimin Zhan"
   s.email   = "zhimin@agileway.net"
@@ -81,7 +81,7 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc    = true
   s.requirements << 'none'
   s.require_path    = "lib"
-  # s.autorequire     = "rwebspec-webdriver"
+  s.autorequire     = "rwebspec-webdriver"
 
   s.files = [ "Rakefile", "README", "CHANGELOG", "MIT-LICENSE" ]
   s.files = s.files + Dir.glob( "lib/**/*" )
@@ -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.3.0")
+  s.add_dependency("selenium-webdriver", ">= 2.0.1")
   s.add_dependency("sanitize", ">= 2.0.0")
 end
 

data/lib/rwebspec-webdriver.rb

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

data/lib/rwebspec-webdriver/driver.rb

@@ -783,7 +783,7 @@ module RWebSpec
       #    try { click_link('waiting')}
       #    try(10, 2) { click_button('Search' } # try to click the 'Search' button upto 10 seconds, try every 2 seconds
       #    try { click_button('Search' }
-      def try(timeout = @@default_timeout, polling_interval = @@default_polling_interval || 1, & block)
+      def try_until(timeout = @@default_timeout, polling_interval = @@default_polling_interval || 1, & block)
         start_time = Time.now
 
         last_error = nil
@@ -801,8 +801,15 @@ module RWebSpec
         raise "Timeout after #{duration.to_i} seconds."
       end
 
-      alias try_upto try
+      alias try_upto try_until
 
+	    def try(timeout = @@default_timeout, polling_interval = @@default_polling_interval || 1, &block)
+	      puts "Warning: method 'try' is deprecated (won't support in RWebSpec 3), use try_until instead."
+	      try_until(timeout, polling_interval) {
+	        yield
+	      }
+	    end
+	
       ##
       #  Convert :first to 1, :second to 2, and so on...
       def symbol_to_sequence(symb)

data/lib/rwebspec-webdriver/web_browser.rb

@@ -525,10 +525,7 @@ module RWebSpec
         options = select_box.find_elements(:tag_name, "option")
         options.each do |opt|
           # puts opt.methods
-					if text ==  opt.text
-	          opt.click 
-						break
-					end
+          opt.click if text ==  opt.text
         end
         # select_list(:name, selectName).select(option)
       end
@@ -555,17 +552,14 @@ 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.selected?
-            the_checkbox.click
+          if the_checkbox
+            the_checkbox.click unless the_checkbox.selected?
             return
           end
 
           arys.each { |cbx_value|
             elements.each do |elem|
-							if elem.attribute('value') == cbx_value && !the_checkbox.selected?
-	              elem.click 
-								return
-							end
+              elem.click if elem.attribute('value') == cbx_value && !the_checkbox.selected?
             end
           }
         else
@@ -583,24 +577,19 @@ 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.selected?
-            the_checkbox.clear 
-            # the_checkbox.click if the_checkbox.selected?
+          if the_checkbox
+            the_checkbox.click if the_checkbox.selected?
             return
           end
 
           arys.each { |cbx_value|
             elements.each do |elem|
-							if elem.attribute('value') == cbx_value && the_checkbox && the_checkbox.selected?
-								# elem.click 
-	              elem.clear
-								break
-							end
+              elem.click if elem.attribute('value') == cbx_value && the_checkbox && the_checkbox.selected?
             end
           }
         else
           the_checkbox = find_element(:name, checkBoxName)
-          the_checkbox.clear if the_checkbox.selected?
+          the_checkbox.click if the_checkbox.selected?
         end
       end
 
@@ -640,7 +629,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
-				find_element(:name, file_field).set_keys(normalized_file_path)
+        file_field(:name, file_field).set(normalized_file_path)
       end
 
       def start_window(url = nil)

metadata

@@ -4,17 +4,16 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 5
-  version: 0.1.5
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Zhimin Zhan
-autorequire: 
+autorequire: rwebspec-webdriver
 bindir: bin
 cert_chain: []
 
-date: 2011-11-30 00:00:00 +10:00
+date: 2011-12-18 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,9 +39,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 3
         - 0
-        version: 2.3.0
+        - 1
+        version: 2.0.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -59,7 +58,7 @@ dependencies:
         version: 2.0.0
   type: :runtime
   version_requirements: *id003
-description: Alternative web test syntax on top of Selenium-WebDriver
+description: 
 email: zhimin@agileway.net
 executables: []