selenium-rails 0.0.1 → 0.0.2

data/README.txt

@@ -7,7 +7,7 @@ Selenium Rails supports the use of Selenium RC with Ruby on Rails projects.
 
 = Instructions
 
-* gem install selenium-rake
+* gem install selenium-rails
 * Copy the file /lib/tasks/selenium_tasks.rake into your app's lib/tasks directory
 * Write some selenium tests under test/selenium.  For an example app, see http://github.com/pivotal/minimalenium
 * 'rake test:selenium' to run all selenium tests

data/lib/selenium_rails/selenium_driver_manager.rb

@@ -1,22 +1,28 @@
 module Selenium
   class SeleniumDriverManager
-    @@selenium_driver = nil
+    # supports multiple drivers, keyed by options
+    @@selenium_drivers = {}
 
     def self.driver(driver_options = {})
-      unless @@selenium_driver
-        browser_start_command = ENV['BROWSER_START_COMMAND'] ? ENV['BROWSER_START_COMMAND'] : '*firefox'
-        opts = {:server_host => 'localhost', :server_port => '4444', :browser_start_command => browser_start_command, 
-                :browser_url => 'http://localhost:3001', :timeout => 10000}.merge(driver_options)
-        @@selenium_driver = Selenium::SeleniumDriver.new(opts[:server_host], opts[:server_port], opts[:browser_start_command],
+      browser_start_command = ENV['BROWSER_START_COMMAND'] ? ENV['BROWSER_START_COMMAND'] : '*firefox'
+      opts = {:server_host => 'localhost', :server_port => '4444', :browser_start_command => browser_start_command, 
+              :browser_url => 'http://localhost:3001', :timeout => 10000}.merge(driver_options)
+      key = opts.map {|key, value| key.to_s + '=>' + value.to_s}.sort.join(',')
+      unless @@selenium_drivers[key]
+        @@selenium_drivers[key] = Selenium::SeleniumDriver.new(opts[:server_host], opts[:server_port], opts[:browser_start_command],
                                      opts[:browser_url], opts[:timeout])
-        @@selenium_driver.start
+        @@selenium_drivers[key].start
       end
-      @@selenium_driver
+      @@selenium_drivers[key]
     end
 
-    def self.stop_driver
-      @@selenium_driver.stop if @@selenium_driver
-      @@selenium_driver = nil
+    def self.stop_drivers
+      # Doesn't actually do anything if called from a different process than the one where the
+      # drivers were started, but they will die anyway when the server is killed.
+      @@selenium_drivers.each do |key, selenium_driver|
+        selenium_driver.stop
+        @@selenium_drivers.delete(key)
+      end
     end
   end
 end

data/lib/selenium_rails/servers_runner.rb

@@ -13,7 +13,7 @@ module SeleniumRails
 
         yield
 
-        Selenium::SeleniumDriverManager.stop_driver
+        Selenium::SeleniumDriverManager.stop_drivers
       rescue Exception => e
         puts e
         raise e

data/selenium-rails.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{selenium-rails}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
  
   s.specification_version = 2 if s.respond_to? :specification_version=
  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: selenium-rails
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Chad Woolley, Others
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: selenium-rails
-rubygems_version: 1.3.0
+rubygems_version: 1.2.0.1861
 signing_key: 
 specification_version: 2
 summary: Support for using Selenium RC with Rails.