saucelabs-adapter 0.8.3 → 0.8.4

data/VERSION

@@ -1 +1 @@
-0.8.3
+0.8.4

data/lib/saucelabs_adapter/jsunit_selenium_support.rb

@@ -36,10 +36,12 @@ module SaucelabsAdapter
         :pageLoadTimeout => "60",
         :suppressCacheBuster => (@selenium_config.selenium_server_address == 'saucelabs.com').to_s
       }
-      jsunit_params.reverse_merge!(default_jsunit_params)
+      jsunit_params = default_jsunit_params.merge(jsunit_params)
 
       test_url = "/jsunit/javascripts/jsunit/jsunit/testRunner.html?" + jsunit_params.map { |k,v| "#{k}=#{v}" }.join("&")
-      options.reverse_merge!(:polling_interval => @selenium_config.jsunit_polling_interval_seconds) if @selenium_config.jsunit_polling_interval_seconds
+      if @selenium_config.jsunit_polling_interval_seconds
+        options = {:polling_interval => @selenium_config.jsunit_polling_interval_seconds}.merge(options)
+      end
       run_suite(@selenium_driver, test_url, options)
     end
 
@@ -82,7 +84,7 @@ module SaucelabsAdapter
         :timeout_in_seconds => 1200,
         :polling_interval => 5
       }
-      options.reverse_merge!(default_options)
+      options = default_options.merge(options)
 
       selenium_driver.open(suite_path)
 

data/lib/saucelabs_adapter/run_utils.rb

@@ -3,7 +3,7 @@ class RunUtils
     default_options = {
       :raise_on_fail => true
     }
-    options.reverse_merge!(default_options)
+    options = default_options.merge(options)
     puts "Executing: #{command}"
     success = system(command)
     if !success && options[:raise_on_fail]

data/lib/saucelabs_adapter/selenium_config.rb

@@ -129,6 +129,9 @@ module SaucelabsAdapter
               errors << require_attributes([:tunnel_password, :tunnel_keyfile],
                                            :when => "when tunnel_method is :sshtunnel",
                                            :any_or_all => :any)
+              if tunnel_keyfile && !File.exist?(File.expand_path(tunnel_keyfile))
+                errors << "tunnel_keyfile '#{tunnel_keyfile}' does not exist" 
+              end
             else
               errors << "Unknown tunnel_method: #{tunnel_method}"
           end
@@ -149,7 +152,8 @@ module SaucelabsAdapter
         :when => "",
         :any_or_all => :all
       }
-      options.reverse_merge!(default_options)
+      options = default_options.merge(options)
+
       errors = []
       names.each do |attribute|
         errors << "#{attribute} is required #{options[:when]}" if send(attribute).nil?
@@ -168,4 +172,4 @@ module SaucelabsAdapter
       }
     end
   end
-end
+end

data/lib/saucelabs_adapter/tunnels/ssh_tunnel.rb

@@ -17,7 +17,11 @@ module SaucelabsAdapter
       return
       # just return; tunnel is all in transient memory, and we don't want to hang or abort the whole test suite anyway
       # This could potentially be a problem when opening an SshTunnel multiple times during a single interpreter, but we'll see...
+      # if @gateway
+      #   say "Shutting down ssh reverse tunnel"
+      #   @gateway.close(@port) if @port
+      #   @gateway.shutdown! if @gateway
+      # end
     end
-
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 3
-  version: 0.8.3
+  - 4
+  version: 0.8.4
 platform: ruby
 authors: 
 - Kelly Felkins, Chad Woolley & Sam Pierson
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-15 00:00:00 -07:00
+date: 2010-04-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency