selenium-client 1.2.17 → 1.2.18

data/README.markdown

@@ -153,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.8"
+    gem "rspec", ">=1.2.8"
     gem "selenium-client", ">=1.2.16"
     require "selenium/client"
     require "selenium/rspec/spec_helper"
@@ -326,3 +326,8 @@ Contributors
    - Fix escaping bug when dealing with embedded regexes such as
      "webratlink=evalregex:/Pastry Lovers \\(Organizer\\)/"
      [patch](http://github.com/derfred/selenium-client/commit/4342cbb39d1a92b8db8f26ee0dc6c1a8f3287737)
+
+ * [Alex Chaffe](http://alexch.github.com)
+   - Better error reporting and fixed bug where if the response 
+     doesn't start with "OK" it swallows the first three
+     chars (leading to annoying "ed out after 5000 msec" messages)

data/examples/rspec/google_spec.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
-gem "rspec", "=1.2.8"
-gem "selenium-client", ">=1.2.17"
+gem "rspec", ">=1.2.8"
+gem "selenium-client", ">=1.2.18"
 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.17"
+gem "selenium-client", ">=1.2.18"
 require "selenium/client"
 
 begin

data/examples/testunit/google_test.rb

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

data/lib/selenium/client.rb

@@ -13,7 +13,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../nautilus/shell')
 require File.expand_path(File.dirname(__FILE__) + '/command_error')
 require File.expand_path(File.dirname(__FILE__) + '/protocol_error')
 require File.expand_path(File.dirname(__FILE__) + '/client/protocol')
-require File.expand_path(File.dirname(__FILE__) + '/client/generated_driver')
+require File.expand_path(File.dirname(__FILE__) + '/client/legacy_driver')
 require File.expand_path(File.dirname(__FILE__) + '/client/javascript_expression_builder')
 require File.expand_path(File.dirname(__FILE__) + '/client/javascript_frameworks/prototype')
 require File.expand_path(File.dirname(__FILE__) + '/client/javascript_frameworks/jquery')

data/lib/selenium/client/idiomatic.rb

@@ -472,7 +472,7 @@ module Selenium
       # Set the execution delay in milliseconds, i.e. a pause delay following
       # each selenium operation. By default, there is no such delay.
       #
-      # Setting an execution can be useful to troubleshoot of capture videos
+      # Setting an execution can be useful to troubleshoot or capture videos
       def execution_delay=(delay_in_milliseconds)
         remote_control_command "setSpeed", [delay_in_milliseconds]
       end

data/lib/selenium/client/protocol.rb

@@ -11,7 +11,7 @@ module Selenium
         timeout(@default_timeout_in_seconds) do
           status, response = http_post(http_request_for(verb, args))
           raise Selenium::CommandError, response unless status == "OK"          
-          response
+          response[3..-1] # strip "OK," from response
         end
       end
       
@@ -81,13 +81,21 @@ module Selenium
       end
             
       def http_post(data)
-        # puts "Requesting ---> #{data.inspect}"
+        start = Time.now
+        called_from = caller.detect{|line| line !~ /(selenium-client|vendor|usr\/lib\/ruby|\(eval\))/i}
         http = Net::HTTP.new(@host, @port)
         http.open_timeout = default_timeout_in_seconds
         http.read_timeout = default_timeout_in_seconds
         response = http.post('/selenium-server/driver/', data, HTTP_HEADERS)
-        # puts "RESULT: #{response.body.inspect}\n"
-        [ response.body[0..1], response.body[3..-1] ]
+        if response.body !~ /^OK/
+          puts "#{start} selenium-client received failure from selenium server:"
+          puts "requested:"
+          puts "\t" + CGI::unescape(data.split('&').join("\n\t"))
+          puts "received:"
+          puts "\t#{response.body.inspect}"
+          puts "\tcalled from #{called_from}"
+        end
+        [ response.body[0..1], response.body ]
       end
      
     end

data/lib/selenium/rake/remote_control_start_task.rb

@@ -23,7 +23,7 @@ module Selenium
     # Control. You will find the nightly build at 
     # http://nexus.openqa.org/content/repositories/snapshots/org/seleniumhq/selenium/server/selenium-server/
     class RemoteControlStartTask
-      attr_accessor :port, :timeout_in_seconds, :background, 
+      attr_accessor :host, :port, :timeout_in_seconds, :background, 
                     :wait_until_up_and_running, :additional_args,
                     :log_to
       attr_reader :jar_file
@@ -32,6 +32,7 @@ module Selenium
 
       def initialize(name = :'selenium:rc:start')
         @name = name
+        @host = "localhost"
         @port = 4444
         @timeout_in_seconds = 5
         project_specific_jar = Dir[JAR_FILE_PATTERN].first

data/lib/selenium/remote_control/remote_control.rb

@@ -2,14 +2,15 @@ module Selenium
   module RemoteControl
     
     class RemoteControl
-      attr_reader :host, :port, :timeout_in_seconds, :shutdown_command
+      attr_reader :host, :port, :timeout_in_seconds, :firefox_profile, :shutdown_command
       attr_accessor :additional_args, :jar_file, :log_to
       
       def initialize(host, port, options={})
         @host, @port = host, port
         @timeout_in_seconds = options[:timeout] || (2 * 60)
         @shutdown_command = options[:shutdown_command] || "shutDownSeleniumServer"
-        @additional_args = []
+        @firefox_profile = options[:firefox_profile]
+        @additional_args = options[:additional_args] || []
         @shell = Nautilus::Shell.new
       end
       
@@ -17,6 +18,7 @@ module Selenium
         command = "java -jar \"#{jar_file}\""
         command << " -port #{@port}"
         command << " -timeout #{@timeout_in_seconds}"
+        command << " -firefoxProfileTemplate '#{@firefox_profile}'" if @firefox_profile
         command << " #{additional_args.join(' ')}" unless additional_args.empty?
         command << " > #{log_to}" if log_to
         

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.8"
+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.8"
+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.17
+  version: 1.2.18
 platform: ruby
 authors: 
 - OpenQA
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-28 00:00:00 -07:00
+date: 2010-01-12 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -26,11 +26,11 @@ files:
 - lib/selenium/client/base.rb
 - lib/selenium/client/driver.rb
 - lib/selenium/client/extensions.rb
-- lib/selenium/client/generated_driver.rb
 - lib/selenium/client/idiomatic.rb
 - lib/selenium/client/javascript_expression_builder.rb
 - lib/selenium/client/javascript_frameworks/jquery.rb
 - lib/selenium/client/javascript_frameworks/prototype.rb
+- lib/selenium/client/legacy_driver.rb
 - lib/selenium/client/protocol.rb
 - lib/selenium/client/selenium_helper.rb
 - lib/selenium/client.rb