selenium-client 1.2.16 → 1.2.17

data/README.markdown

@@ -46,7 +46,9 @@ Features
   * `click 'the_button_id', :wait_for => :no_text, :element => 'notification_box', :text => 'Disappearing Text'`
   * `click 'the_button_id', :wait_for => :effects`
   * `click 'the_button_id', :wait_for => :value, :element => 'a_locator', :value => 'some value'`
-  * `click 'the_button_id', :wait_for => :no_value, :element => 'a_locator', :value => 'some value' # will wait for the field value of 'a_locator' to not be 'some value'`  
+  * `click 'the_button_id', :wait_for => :no_value, :element => 'a_locator', :value => 'some value'`
+  * `click 'the_button_id', :wait_for => :visible, :element => 'a_locator'`
+  * `click 'the_button_id', :wait_for => :not_visible, :element => 'a_locator'`
   * `click 'the_button_id', :wait_for => :condition, :javascript => "some arbitrary javascript expression"`
 
   Check out the `click`, `go_back` and `wait_for` methods of the [Idiomatic Module](http://selenium-client.rubyforge.org/classes/Selenium/Client/Idiomatic.html)
@@ -151,7 +153,7 @@ Writing Tests
  If BDD is more your style, here is how you can achieve the same thing  using RSpec:
 
     require 'rubygems'
-    gem "rspec", "=1.2.6"
+    gem "rspec", "=1.2.8"
     gem "selenium-client", ">=1.2.16"
     require "selenium/client"
     require "selenium/rspec/spec_helper"
@@ -316,4 +318,11 @@ Contributors
 * [Adam Greene](http://blog.sweetspot.dm) (`skippy`)
    - Added the ability to redirect output to a log file, when
      launching Selenium Remote Control with the Rake task
-   
+
+* [Eliot Sykes](http://blog.eliotsykes.com) (`eliotsykes`)
+   - wait_for_visibility [patch](http://github.com/eliotsykes/selenium-client/commit/4c7f3d01aa75a6b1917fbf71335b0069392ed546)
+
+* [Frederik Fix](http://github.com/derfred)(`derfred`)
+   - Fix escaping bug when dealing with embedded regexes such as
+     "webratlink=evalregex:/Pastry Lovers \\(Organizer\\)/"
+     [patch](http://github.com/derfred/selenium-client/commit/4342cbb39d1a92b8db8f26ee0dc6c1a8f3287737)

data/examples/rspec/google_spec.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
-gem "rspec", "=1.2.6"
-gem "selenium-client", ">=1.2.16"
+gem "rspec", "=1.2.8"
+gem "selenium-client", ">=1.2.17"
 require "selenium/client"
 require "selenium/rspec/spec_helper"
 

data/examples/script/google.rb

@@ -3,7 +3,7 @@
 # Sample Ruby script using the Selenium client API
 #
 require "rubygems"
-gem "selenium-client", ">=1.2.16"
+gem "selenium-client", ">=1.2.17"
 require "selenium/client"
 
 begin

data/examples/testunit/google_test.rb

@@ -4,7 +4,7 @@
 #
 require "test/unit"
 require "rubygems"
-gem "selenium-client", ">=1.2.16"
+gem "selenium-client", ">=1.2.17"
 require "selenium/client"
 
 class ExampleTest < Test::Unit::TestCase

data/lib/selenium/client/extensions.rb

@@ -4,7 +4,7 @@ module Selenium
     # Convenience methods not explicitely part of the protocol
     module Extensions
 	
-	    # These for all Ajax request to finish (Only works if you are using prototype, the wait in happenning browser side)
+	    # These for all Ajax request to finish (Only works if you are using prototype, the wait happens in the browser)
 	    #
 	    # See http://davidvollbracht.com/2008/6/4/30-days-of-tech-day-3-waitforajax for
 	    # more background.
@@ -14,7 +14,7 @@ module Selenium
 	                         options[:timeout_in_seconds]
       end
 	
-	    # Wait for all Prototype effects to be processed (the wait in happenning browser side).
+	    # Wait for all Prototype effects to be processed (the wait happens in the browser).
 	    #
 	    # Credits to http://github.com/brynary/webrat/tree/master
 			def wait_for_effects(options={})
@@ -23,19 +23,19 @@ module Selenium
 			                     options[:timeout_in_seconds]
 			end
 			
-			# Wait for an element to be present (the wait in happenning browser side).
-		  def wait_for_element(locator, options={})
-		    builder = JavascriptExpressionBuilder.new 
-		    builder.find_element(locator).append("element != null;")
-		    wait_for_condition builder.script, options[:timeout_in_seconds]
-		  end
+      # Wait for an element to be present (the wait happens in the browser).
+      def wait_for_element(locator, options={})
+        builder = JavascriptExpressionBuilder.new 
+        builder.find_element(locator).append("element != null;")
+        wait_for_condition builder.script, options[:timeout_in_seconds]
+      end
 
-			# Wait for an element to NOT be present (the wait in happenning browser side).
-		  def wait_for_no_element(locator, options={})
-		    builder = JavascriptExpressionBuilder.new 
-		    builder.find_element(locator).append("element == null;")
-		    wait_for_condition builder.script, options[:timeout_in_seconds]
-		  end
+      # Wait for an element to NOT be present (the wait happens in the browser).
+      def wait_for_no_element(locator, options={})
+        builder = JavascriptExpressionBuilder.new 
+        builder.find_element(locator).append("element == null;")
+        wait_for_condition builder.script, options[:timeout_in_seconds]
+      end
 
 			# Wait for some text to be present (the wait is happening browser side).
 			#
@@ -73,7 +73,7 @@ module Selenium
         wait_for_condition builder.script, options[:timeout_in_seconds]
       end
       
-      # Wait for some text to NOT be present (the wait in happenning browser side).
+      # Wait for some text to NOT be present (the wait happens in the browser).
       #
       # See wait_for_text for usage details.
       def wait_for_no_text(pattern, options={})
@@ -82,19 +82,32 @@ module Selenium
         wait_for_condition builder.script, options[:timeout_in_seconds]
       end
 
-			# Wait for a field to get a specific value (the wait in happenning browser side).
+      # Wait for a field to get a specific value (the wait happens in the browser).
       def wait_for_field_value(locator, expected_value, options={})
         builder = JavascriptExpressionBuilder.new 
         builder.find_element(locator).element_value_is(expected_value)
         wait_for_condition builder.script, options[:timeout_in_seconds]
       end
 
+      # Wait for a field to not have a specific value (the wait happens in the browser).
       def wait_for_no_field_value(locator, expected_value, options={})
         builder = JavascriptExpressionBuilder.new 
         builder.find_element(locator).element_value_is_not(expected_value)
         wait_for_condition builder.script, options[:timeout_in_seconds]
       end
 
+      # Wait for something to be visible (the wait happens in the browser).
+      def wait_for_visible(locator, options={})
+        builder = JavascriptExpressionBuilder.new 
+        wait_for_condition builder.visible(locator).script, options[:timeout_in_seconds]
+      end
+
+      # Wait for something to not be visible (the wait happens in the browser).
+      def wait_for_not_visible(locator, options={})
+        builder = JavascriptExpressionBuilder.new 
+        wait_for_condition builder.not_visible(locator).script, options[:timeout_in_seconds]
+      end
+
       def active_javascript_framework(options)
         options[:javascript_framework] || default_javascript_framework
       end

data/lib/selenium/client/idiomatic.rb

@@ -42,8 +42,8 @@ module Selenium
       # * 'timeout_in_seconds' is a timeout in seconds, after which this 
       #   command will return with an error
       def wait_for_page(timeout_in_seconds=nil)
-        actual_timeout = timeout_in_seconds || default_timeout_in_seconds
-        remote_control_command "waitForPageToLoad", [actual_timeout * 1000,]
+        remote_control_command "waitForPageToLoad", 
+            [actual_timeout_in_milliseconds(timeout_in_seconds),]
       end
       alias_method :wait_for_page_to_load, :wait_for_page
 
@@ -52,8 +52,8 @@ module Selenium
       # window_id is the JavaScript window "name" of the window that will appear (not the text of the title bar)
       # timeout_in_seconds is a timeout in seconds, after which the action will return with an error
       def wait_for_popup(window_id, timeout_in_seconds=nil)
-        actual_timeout = timeout_in_seconds || default_timeout_in_seconds
-        remote_control_command "waitForPopUp", [window_id, actual_timeout * 1000 ,]
+        remote_control_command "waitForPopUp", 
+            [window_id, actual_timeout_in_milliseconds(timeout_in_seconds) ,]
       end
 
       # Flexible wait semantics. ait is happening browser side. Useful for testing AJAX application.
@@ -74,6 +74,8 @@ module Selenium
       # * wait :wait_for => :no_text, :element => 'a_locator', :text => 'some text'    # will wait for the content of 'a_locator' to not be 'some text'
       # * wait :wait_for => :value, :element => 'a_locator', :value => 'some value'    # will wait for the field value of 'a_locator' to be 'some value'
       # * wait :wait_for => :no_value, :element => 'a_locator', :value => 'some value' # will wait for the field value of 'a_locator' to not be 'some value'
+      # * wait :wait_for => :visible, :element => 'a_locator'                          # will wait for element to be visible
+      # * wait :wait_for => :not_visible, :element => 'a_locator'                      # will wait for element to not be visible
       # * wait :wait_for => :condition, :javascript => 'some expression'               # will wait for the javascript expression to be true
       #
       # Using options you can also define an explicit timeout (:timeout_in_seconds key). Otherwise the default driver timeout
@@ -100,6 +102,10 @@ module Selenium
             wait_for_field_value options[:element], options[:value], options
         elsif options[:wait_for] == :no_value
             wait_for_no_field_value options[:element], options[:value], options
+        elsif options[:wait_for] == :visible
+            wait_for_visible options[:element], options
+        elsif options[:wait_for] == :not_visible
+            wait_for_not_visible options[:element], options
 	      elsif options[:wait_for] == :condition
 	          wait_for_condition options[:javascript], options[:timeout_in_seconds]
         end
@@ -133,6 +139,8 @@ module Selenium
       # * click "a_locator", :wait_for => :no_text, :element => 'a_locator', :text => 'some text'    # will wait for the content of 'a_locator' to not be 'some text'
       # * click "a_locator", :wait_for => :value, :element => 'a_locator', :value => 'some value'    # will wait for the field value of 'a_locator' to be 'some value'
       # * click "a_locator", :wait_for => :no_value, :element => 'a_locator', :value => 'some value' # will wait for the field value of 'a_locator' to not be 'some value'
+      # * click "a_locator", :wait_for => :visible, :element => 'a_locator'                          # will wait for element to be visible
+      # * click "a_locator", :wait_for => :not_visible, :element => 'a_locator'                      # will wait for element to not be visible
       # * click "a_locator", :wait_for => :condition, :javascript => 'some expression'               # will wait for the javascript expression to be true
       #
       # Using options you can also define an explicit timeout (:timeout_in_seconds key). Otherwise the default driver timeout
@@ -284,7 +292,7 @@ module Selenium
       #
       # Actions that require waiting include "open" and the "waitFor*" actions.
       def remote_control_timeout_in_seconds=(timeout_in_seconds)
-          remote_control_command "setTimeout", [timeout_in_seconds * 1000,]
+        remote_control_command "setTimeout", [actual_timeout_in_milliseconds(timeout_in_seconds),]
       end
 
       # Returns the text from a cell of a table. The cellAddress syntax
@@ -308,7 +316,8 @@ module Selenium
       # * 'script' is the JavaScript snippet to run
       # * 'timeout_in_seconds' is a timeout in seconds, after which this command will return with an error
       def wait_for_condition(script, timeout_in_seconds = nil)
-        remote_control_command "waitForCondition", [script, (timeout_in_seconds || default_timeout_in_seconds) * 1000,]
+        remote_control_command "waitForCondition", 
+            [script, actual_timeout_in_milliseconds(timeout_in_seconds),]
       end
 
       # Simulates the user clicking the "back" button on their browser.
@@ -331,6 +340,8 @@ module Selenium
       # * go_back :wait_for => :no_text, :element => 'a_locator', :text => 'some text'    # will wait for the content of 'a_locator' to not be 'some text'
       # * go_back :wait_for => :condition, :javascript => 'some expression'               # will wait for the javascript expression to be true
       # * go_back :wait_for => :value, :element => 'a_locator', :value => 'some value'    # will wait for the field value of 'a_locator' to be 'some value'
+      # * go_back :wait_for => :visible, :element => 'a_locator'                          # will wait for element to be visible
+      # * go_back :wait_for => :not_visible, :element => 'a_locator'                      # will wait for element to not be visible
       # * go_back :wait_for => :no_value, :element => 'a_locator', :value => 'some value' # will wait for the field value of 'a_locator' to not be 'some value'
       #
       # Using options you can also define an explicit timeout (:timeout_in_seconds key). Otherwise the default driver timeout
@@ -466,6 +477,11 @@ module Selenium
         remote_control_command "setSpeed", [delay_in_milliseconds]
       end
 
+      def actual_timeout_in_milliseconds(timeout_in_seconds)
+        actual_timeout = (timeout_in_seconds || 
+                          default_timeout_in_seconds).to_i
+        actual_timeout * 1000
+      end
     end
 
   end

data/lib/selenium/client/javascript_expression_builder.rb

@@ -22,6 +22,14 @@ module Selenium
 			  append window_script("Effect.Queue.size() == 0")
 			end
 
+      def visible(locator)
+        append "selenium.isVisible('#{quote_escaped(locator)}')"
+      end
+
+      def not_visible(locator)
+        append "!selenium.isVisible('#{quote_escaped(locator)}')"
+      end
+      
       def find_element(locator)
         append  <<-EOS
           var element;
@@ -101,7 +109,7 @@ module Selenium
       end
 
       def quote_escaped(a_string)
-        a_string.gsub(/'/, %q<\\\'>)
+        a_string.gsub(/\\/, "\\\\\\").gsub(/'/, %q<\\\'>)
       end
     end
   end

data/lib/selenium/rake/default_tasks.rb

@@ -0,0 +1,16 @@
+require 'selenium/rake/tasks'
+
+Selenium::Rake::RemoteControlStartTask.new do |rc|
+  rc.timeout_in_seconds = 3 * 60
+  rc.background = true
+  rc.wait_until_up_and_running = true
+  rc.additional_args << "-singleWindow"
+end
+
+Selenium::Rake::RemoteControlStopTask.new
+
+desc "Restart Selenium Remote Control"
+task :'selenium:rc:restart' do
+  Rake::Task[:'selenium:rc:stop'].execute [] rescue nil
+  Rake::Task[:'selenium:rc:start'].execute []
+end

data/lib/selenium/rake/remote_control_start_task.rb

@@ -28,11 +28,13 @@ module Selenium
                     :log_to
       attr_reader :jar_file
 
+      JAR_FILE_PATTERN = "vendor/selenium-remote-control/selenium-server-*.jar"
+
       def initialize(name = :'selenium:rc:start')
         @name = name
         @port = 4444
         @timeout_in_seconds = 5
-        project_specific_jar = Dir["vendor/selenium-remote-control/selenium-server*-standalone.jar"].first
+        project_specific_jar = Dir[JAR_FILE_PATTERN].first
         @jar_file = project_specific_jar
         @additional_args = []
         @background = false
@@ -49,6 +51,7 @@ module Selenium
         desc "Launch Selenium Remote Control"
         task @name do
           puts "Starting Selenium Remote Control at 0.0.0.0:#{@port}..."
+          raise "Could not find jar file '#{@jar_file}'. Expected it under #{JAR_FILE_PATTERN}" unless @jar_file && File.exists?(@jar_file)
           remote_control = Selenium::RemoteControl::RemoteControl.new("0.0.0.0", @port, :timeout => @timeout_in_seconds)
           remote_control.jar_file = @jar_file
           remote_control.additional_args = @additional_args

data/lib/selenium/rspec/reporting/selenium_test_report_formatter.rb

@@ -7,7 +7,7 @@ require "digest/md5"
 require "base64"
 require 'tmpdir'
 require "rubygems"
-gem "rspec", "1.2.6"
+gem "rspec", "1.2.8"
 require "spec"
 require 'spec/runner/formatter/html_formatter'
 require File.expand_path(File.dirname(__FILE__) + "/file_path_strategy")

data/lib/selenium/rspec/rspec_extensions.rb

@@ -1,5 +1,5 @@
 require "rubygems"
-gem "rspec", "=1.2.6"
+gem "rspec", "=1.2.8"
 require 'spec'
 require 'spec/example/example_group'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: selenium-client
 version: !ruby/object:Gem::Version 
-  version: 1.2.16
+  version: 1.2.17
 platform: ruby
 authors: 
 - OpenQA
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-20 00:00:00 -07:00
+date: 2009-09-28 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -36,6 +36,7 @@ files:
 - lib/selenium/client.rb
 - lib/selenium/command_error.rb
 - lib/selenium/protocol_error.rb
+- lib/selenium/rake/default_tasks.rb
 - lib/selenium/rake/remote_control_start_task.rb
 - lib/selenium/rake/remote_control_stop_task.rb
 - lib/selenium/rake/tasks.rb
@@ -80,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: selenium-client
-rubygems_version: 1.3.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Official Ruby Client for Selenium RC.