sauce 0.17.3.alpha1 → 0.17.3.alpha2

data/lib/sauce/config.rb

@@ -45,13 +45,16 @@ module Sauce
 
     def initialize(opts={})
       @opts = {}
+      @undefaulted_opts = {}
       if opts != false
         @opts.merge! DEFAULT_OPTIONS
-        @opts.merge! load_options_from_yaml
-        @opts.merge! load_options_from_environment
-        @opts.merge! load_options_from_heroku
-        @opts.merge! Sauce.get_config.opts rescue {}
-        @opts.merge! opts
+
+        @undefaulted_opts.merge! load_options_from_yaml
+        @undefaulted_opts.merge! load_options_from_environment
+        @undefaulted_opts.merge! load_options_from_heroku
+        @undefaulted_opts.merge! Sauce.get_config.opts rescue {}
+        @undefaulted_opts.merge! opts
+        @opts.merge! @undefaulted_opts
       end
     end
 
@@ -97,6 +100,9 @@ module Sauce
     end
 
     def browser
+      if @undefaulted_opts[:browser]
+        return @undefaulted_opts[:browser]
+      end
       if @opts[:browsers]
         @opts[:browsers][0][1]
       else
@@ -105,6 +111,9 @@ module Sauce
     end
 
     def os
+      if @undefaulted_opts[:os]
+        return @undefaulted_opts[:os]
+      end
       if @opts[:browsers]
         @opts[:browsers][0][0]
       else
@@ -113,6 +122,9 @@ module Sauce
     end
 
     def browser_version
+      if @undefaulted_opts[:browser_version]
+        return @undefaulted_opts[:browser_version]
+      end
       if @opts[:browsers]
         @opts[:browsers][0][2]
       else

data/sauce.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sauce}
-  s.version = "0.17.3.alpha1"
+  s.version = "0.17.3.alpha2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sean Grove", "Eric Allen", "Steven Hazel"]

data/test/test_config.rb

@@ -44,6 +44,14 @@ class TestConfig < Test::Unit::TestCase
     assert_equal [["A", "B", "C"]], config.browsers
   end
 
+  def test_default_to_first_item_in_browsers
+    Sauce.config {|c| c.browsers = [["OS_FOO", "BROWSER_FOO", "VERSION_FOO"]] }
+    config = Sauce::Config.new
+    assert_equal "OS_FOO", config.os
+    assert_equal "BROWSER_FOO", config.browser
+    assert_equal "VERSION_FOO", config.browser_version
+  end
+
   def test_boolean_flags
     config = Sauce::Config.new
     config.foo = true
@@ -67,6 +75,14 @@ class TestConfig < Test::Unit::TestCase
     assert_not_equal "A", Sauce::Config.new.os
   end
 
+  def test_override
+    Sauce.config {|c| c.browsers = [["OS_FOO", "BROWSER_FOO", "VERSION_FOO"]] }
+    config = Sauce::Config.new(:os => "OS_BAR", :browser => "BROWSER_BAR", :browser_version => "VERSION_BAR")
+    assert_equal "OS_BAR", config.os
+    assert_equal "BROWSER_BAR", config.browser
+    assert_equal "VERSION_BAR", config.browser_version
+  end
+
   def test_clears_config
     Sauce.config {|c|}
     assert_equal [["Windows 2003", "firefox", "3.6."]], Sauce::Config.new.browsers

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sauce
 version: !ruby/object:Gem::Version 
-  hash: -3702664618
+  hash: -3702664624
   prerelease: 7
   segments: 
   - 0
   - 17
   - 3
   - alpha
-  - 1
-  version: 0.17.3.alpha1
+  - 2
+  version: 0.17.3.alpha2
 platform: ruby
 authors: 
 - Sean Grove