sauce 3.5.1 → 3.5.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzNiZjBiY2JjMDE5ZDc0MTZlMDE1Y2I2ZjMxZGZjZjU1YjdkNDM3Yg==
+    NGZiODg1NTU4MzM1NmJlMDlkZmIxY2QwZWNkY2NiYWU3NGYyZjk3Yw==
   data.tar.gz: !binary |-
-    ODNjNGE3NjgwMmM5YThmZTMxNzhmODNmMmRkYTBmOWJhZDAwMjg1MQ==
+    MGEyMDFjMjQzNjlkOWU1YzMwNzc5NzBjZjIxMzU4OTExMDk2ZmYzMA==
 SHA512:
   metadata.gz: !binary |-
-    YjBlZjE3ODNkODMzYmM5NmVjYTkxMzFlN2Q4NDZhNGZiYjEyMTczOTk0YTNj
-    Yzk5OWQxZDQxMGIzZDQ3ODdkYzUwM2U5YTUyNmJkOTQ5MjczMGVjOWYzMDRl
-    N2Y5ZjE4MTI3M2RjMzA5ZDQyYWIxMDY0MGY0OGIxNjYzZjQ2ZTE=
+    YTdhODQ4OTMwMGJhZTVlYjQzMDQ4NzEyZDExZWIxYjg0Y2M3MzE1MWEzYzcw
+    NDJjMjA1NTgwNDIwMGRjMmNjOTc2MzhhZTBkYzJkNjkxYzgyZmJhYzdhMmQx
+    YjY4ZjQzMzQ1ZTZkOGE3MzZhZjMyZmNkYjc5Yzg0MzYwODhmY2M=
   data.tar.gz: !binary |-
-    YTkxZjYwZDY5M2Y2ZjY4OTUyYTAzNjhiYWNkYTY5OWViMmI4MWM1MGQ3MGFj
-    MTM0ZjVkNGU0OGJiNGJiZTJkYWM1YmQyNmZhMmY2NTVkMjdhMDM5NTQ3NjAy
-    M2UzMDJkN2U3ODU0ODBmM2IxY2ZkMzJiYjIyNzI0ZDU4MjRkOTA=
+    MDIwMjVhNmZhM2ZiYmY4MzUxOTVmYzZlNWIzNmY0Y2IyM2JmZDc4ZTVjYjk4
+    NDI0MjI3MTA5Y2NjMTVmMWIyZWE5ZTE5OTYyZjFjZWQwMTEwN2FjMmFmNDAx
+    MzcwYzczNzYyOWIwYjQ2OGY1NWQyMTRkOTk2MGE0M2ZhOTAxZGI=

data/lib/sauce/config.rb

@@ -100,7 +100,10 @@ module Sauce
           @undefaulted_opts.merge! load_options_from_yaml
           @undefaulted_opts.merge! load_options_from_environment
           @undefaulted_opts.merge! load_options_from_heroku unless ENV["SAUCE_DISABLE_HEROKU_CONFIG"]
-          @undefaulted_opts.merge! Sauce.get_config.opts rescue {}
+          
+          global_config = Sauce.get_config
+          @undefaulted_opts.merge! global_config.opts if global_config.opts
+          @whitelisted_capabilities = global_config.whitelisted_capabilities
         end
 
         @undefaulted_opts.merge! opts
@@ -247,7 +250,7 @@ module Sauce
 
     def browser_version
       if single_browser_set?
-        return @undefaulted_opts[:browser_version]
+        return @undefaulted_opts[:browser_version] || @undefaulted_opts[:version]
       end
       if !ENV["TEST_ENV_NUMBER"] && @opts[:browsers]
         @opts[:browsers][0][2]

data/lib/sauce/selenium.rb

@@ -48,6 +48,7 @@ module Sauce
       @config = Sauce::Config.new(opts)
       http_client = ::Selenium::WebDriver::Remote::Http::Persistent.new
       http_client.timeout = 300 # Browser launch can take a while
+
       @driver = ::Selenium::WebDriver.for(:remote,
                       :url => "http://#{@config.username}:#{@config.access_key}@#{@config.host}:#{@config.port}/wd/hub",
                       :desired_capabilities => @config.to_desired_capabilities,

data/lib/sauce/version.rb

@@ -1,6 +1,6 @@
 module Sauce
   MAJOR_VERSION = '3.5'
-  PATCH_VERSION = '1'
+  PATCH_VERSION = '2'
 
   def version
     "#{MAJOR_VERSION}.#{PATCH_VERSION}"

data/spec/sauce/config/config_spec.rb

@@ -269,6 +269,13 @@ describe Sauce::Config do
         config.to_desired_capabilities[:new_option].should include 'elderflower'
       end
 
+      it 'should include them when created anew' do
+        config.whitelist :new_option
+        config_two = Sauce::Config.new({})
+        config_two[:new_option] = 'elderflower'
+        config_two.to_desired_capabilities[:new_option].should include 'elderflower'
+      end
+
       it 'should allow multiple exceptions' do
         config[:new_option] = 'elderflower'
         config[:another_option] = 'mint'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sauce
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.5.2
 platform: ruby
 authors:
 - Dylan Lacey
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec