sauce 3.4.9 → 3.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjUzOTg4YzRhNmM5ODZkMWVlN2NlNjM2ZDA5YWQwMDkyNWQ2N2M0OA==
+    YmRhMDYwMjkzNTI2ZWM2NDUxMDBkN2I0YTQ5YzVjMTJmODVkMzBlMg==
   data.tar.gz: !binary |-
-    ZjdlNjQwMzlmMGJlMDcwNzE1ZmFjYWFmMDRkMjcxOWMxZjlmYjViMQ==
+    ZDQ3NTNlMGUzOTc5Nzg3Yjk2MWI1NjYyYTM3MGQ3MjMyMDFmNWZhYQ==
 SHA512:
   metadata.gz: !binary |-
-    YzFkMjBiZjg1ZWM4NjdlY2NjYzdlNDQzNjhjMjc3YjY3ZmMxYTkwNWJiMThl
-    NzEzNTE5YWRkZjU4YTc0ZjI1NDgzNjEzZWIxMGE2ODc5OWQwMjc5MWQwMDRh
-    N2QwYjg3Njg2NmU0Y2EwYzIyY2E5ZjUzZTRmMWFmODNmYjgzZTc=
+    NzU0ZjlhMDM3Y2E2NDRhMGU4NmFhYmVjZDM0M2UyNGVkYTBkNGExZWVhYzZh
+    NTNmNzM3YzZhOTQyNmJkYjBlZjExMjU4NWVmMWI2OTU0N2Y4ZjU3NDM5Y2I0
+    OGY2NTQ2NTkxOGNhMmRhYTMyMmY1NjJjYzYwNTk5Y2QwNjBjNzY=
   data.tar.gz: !binary |-
-    Zjc4ZWVlMmE2OWU2NTdiNjM4MDdjY2E0MzJmZTcxOWJhMGU4NjM0ODY2ZmQw
-    MjY0YWNhOGMzYmYyNGY2ZWUxZjJlOTNhZDJlNWRhNGVmOTc4NmVhNTlmNTVh
-    OWM5YWFlM2Q2MGVhMDgwY2Q3Y2UwNDhjZDVlMTE0MmQwYzQzM2M=
+    ZGY0MjQ4ZjkwYmJjYmExNzZmNmMxNGEwY2NjZDgwMGM3ZjA4MzczODkzMjgw
+    MGM4NzNlNTk0ZjMxMjg4Y2Q3MjYzMmFlMzEwM2E2OTAyYWY4YWRkYmQ3M2Jj
+    ZjI2MDNhMzZjMTUwNjQ0MzAzNTM3NWZhYmExNTkxMmJhYjYzYjY=

data/lib/sauce.rb

@@ -11,6 +11,7 @@ require 'sauce/job'
 require 'sauce/client'
 require 'sauce/config'
 require 'sauce/selenium'
+require 'sauce/test_base'
 require 'sauce/rspec'
 require 'sauce/test_unit'
 require 'parallel_tests/saucerspec/runner'

data/lib/sauce/config.rb

@@ -142,6 +142,16 @@ module Sauce
       end
     end
 
+    def whitelisted_capabilities
+      @whitelisted_capabilities ||= Set.new 
+    end
+
+    def whitelist capability
+      cap = capability.to_s
+      wl = whitelisted_capabilities || Set.new
+      @whitelisted_capabilities = wl.add cap
+    end
+
     def to_browser_string
       browser_options = {
         'username' => @opts[:username],
@@ -168,7 +178,9 @@ module Sauce
         :client_version => client_version
       }
 
-      SAUCE_OPTIONS.each do |opt|
+      allowed_options = whitelisted_capabilities + SAUCE_OPTIONS
+
+      allowed_options.each do |opt|
         [opt, opt.gsub("-", "_")].map(&:to_sym).each do |sym|
           if @opts.include? sym
             desired_capabilities[opt.to_sym] = @opts[sym]
@@ -193,7 +205,7 @@ module Sauce
       return [[os, browser, browser_version]]
     end
 
-    def browsers_for_location(file, linenumber=nil)
+    def caps_for_location(file, linenumber=nil)
       Sauce::Config.called_from_integrations
       perfile_browsers = @opts[:perfile_browsers]
       
@@ -205,7 +217,7 @@ module Sauce
         else
           platforms = perfile_browsers[file]
         end
-        platforms.map { |p| [p['os'], p['browser'], p['version']] }
+        platforms.map { |p| [p['os'], p['browser'], p['version'], (p['caps'] || {})] }
       else
         browsers
       end
@@ -347,7 +359,7 @@ module Sauce
         ]
 
         paths.each do |path|
-            if File.exists? path
+            if File.exist? path
                 conf = YAML.load_file(path)
                 return conf.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
             end
@@ -385,7 +397,7 @@ module Sauce
 
       if env_browsers
         browsers = JSON.parse(env_browsers)
-        opts[:browsers] = browsers.map { |x| [x['os'], x['browser'], x['version']] }
+        opts[:browsers] = browsers.map { |x| [x['os'], x['browser'], x['version'], x['caps']] }
       end
 
       if hash.include? 'SAUCE_PERFILE_BROWSERS'

data/lib/sauce/parallel/test_group.rb

@@ -9,11 +9,13 @@ module Sauce
       platform = @platforms[@index]
       @index += 1
       begin
-        {
+        caps ={
           'os' => platform[0],
           'browser' => platform[1],
           'version' => platform[2]
         }
+        caps.merge!({:caps => platform[3]}) if platform[3]
+        caps
       rescue NoMethodError => e
         puts "I don't have any config"
       end

data/lib/sauce/rspec.rb

@@ -149,6 +149,7 @@ begin
       end
 
       module SeleniumExampleGroup
+        include Sauce::TestBase
         attr_reader :selenium
         alias_method :s, :selenium
 
@@ -184,13 +185,12 @@ begin
             description = the_test.metadata[:full_description]
             file = the_test.metadata[:file_path]
             exceptions = {}
-            config.browsers_for_location(file).each do |os, browser, version|
+            test_each config.caps_for_location(file), description do |selenium, caps|
+
               example = SeleniumExampleGroup.current_example.call(self)
               example.instance_variable_set(:@exception, nil)
-              @selenium = Sauce::Selenium2.new({:os => os,
-                                                :browser => browser,
-                                                :browser_version => version,
-                                                :job_name => description})
+              
+              @selenium = selenium
               Sauce.driver_pool[Thread.current.object_id] = @selenium
               example.metadata[:sauce_public_link] = SauceWhisk.public_link(@selenium.session_id)
 
@@ -200,6 +200,9 @@ begin
               ensure
                 @selenium.stop
                 begin
+                  os = caps[:os]
+                  browser = caps[:browser]
+                  version = caps[:version]
                   unless success
                     exceptions["#{os} - #{browser} #{version}"] = example.exception
                   end

data/lib/sauce/test_base.rb

@@ -0,0 +1,21 @@
+module Sauce
+  module TestBase
+
+    # Run a block with every platform
+    def test_each(platforms, description)
+      platforms.each do |platform|
+        capabilities = {
+          :os => platform[0],
+          :browser => platform[1],
+          :version => platform[2],
+          :job_name => description
+        }
+
+        capabilities.merge! platform[3] if platform[3]
+        selenium = Sauce::Selenium2.new(capabilities)
+
+        yield selenium, capabilities
+      end
+    end
+  end
+end

data/lib/sauce/version.rb

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

data/lib/tasks/parallel_testing.rb

@@ -2,6 +2,7 @@ require "sauce/parallel/test_broker"
 require "parallel_tests"
 require "parallel_tests/tasks"
 require "parallel_tests/cli_patch"
+require "shellwords"
 
 namespace :sauce do
   desc "Run specs in parallel on Sauce Labs"
@@ -141,7 +142,7 @@ def parse_task_args(test_tool=:rspec, args)
   end
 
   return_args.push *(parallel_options.split(' ')) if parallel_options
-  return_args.push files
+  return_args.concat files.split
 
   return return_args
 end

data/spec/sauce/config/config_spec.rb

@@ -255,46 +255,72 @@ describe Sauce::Config do
       end
     end
 
-    describe "#tools" do
+    context 'with unusual options' do
       let(:config) {Sauce::Config.new}
 
-      before :each do
-        config.stub(:is_defined?).and_call_original
+      it 'should ignore them by default' do
+        config[:new_option] = 'caramel'
+        config.to_desired_capabilities[:new_option].should be_nil
       end
 
-      it "should include rspec if present" do
-        config.tools.should include "Rspec"
+      it 'should include them when configured with exceptions' do
+        config[:new_option] = 'elderflower'
+        config.whitelist :new_option
+        config.to_desired_capabilities[:new_option].should include 'elderflower'
       end
 
-      it "should include capybara" do
-        config.stub(:is_defined?).with("Capybara") {true}
-        config.tools.should include "Capybara"
+      it 'should allow multiple exceptions' do
+        config[:new_option] = 'elderflower'
+        config[:another_option] = 'mint'
+        config.whitelist :new_option
+        config.whitelist :another_option
+          
+        config.to_desired_capabilities[:new_option].should include 'elderflower'
+        config.to_desired_capabilities[:another_option].should include 'mint'
+        config.to_desired_capabilities[:not_an_option].should be_nil
       end
+    end
+  end
 
-      it "should not include capybara when absent" do
-        config.stub(:is_defined?).with("Capybara") {false}
-        config.tools.should_not include "Capybara"
-      end
+  describe "#tools" do
+    let(:config) {Sauce::Config.new}
 
-      it "should not include cucumber when not present" do
-        config.stub(:is_defined?).with("Cucumber") {false}
-        config.tools.should_not include "Cucumber"
-      end
+    before :each do
+      config.stub(:is_defined?).and_call_original
+    end
 
-      it "should include cucumber when present" do
-        config.stub(:is_defined?).with("Cucumber") {true}
-        config.tools.should include "Cucumber"
-      end
+    it "should include rspec if present" do
+      config.tools.should include "Rspec"
+    end
 
-      it "should include test::unit if present" do
-        config.stub(:is_defined?).with("Test","Unit") {true}
-        config.tools.should include "Test::Unit"
-      end
+    it "should include capybara" do
+      config.stub(:is_defined?).with("Capybara") {true}
+      config.tools.should include "Capybara"
+    end
 
-      it "should not include test::unit if absent" do
-        config.stub(:is_defined?).with("Test", "Unit") {false}
-        config.tools.should_not include "Test::Unit"
-      end
+    it "should not include capybara when absent" do
+      config.stub(:is_defined?).with("Capybara") {false}
+      config.tools.should_not include "Capybara"
+    end
+
+    it "should not include cucumber when not present" do
+      config.stub(:is_defined?).with("Cucumber") {false}
+      config.tools.should_not include "Cucumber"
+    end
+
+    it "should include cucumber when present" do
+      config.stub(:is_defined?).with("Cucumber") {true}
+      config.tools.should include "Cucumber"
+    end
+
+    it "should include test::unit if present" do
+      config.stub(:is_defined?).with("Test","Unit") {true}
+      config.tools.should include "Test::Unit"
+    end
+
+    it "should not include test::unit if absent" do
+      config.stub(:is_defined?).with("Test", "Unit") {false}
+      config.tools.should_not include "Test::Unit"
     end
   end
 
@@ -316,6 +342,8 @@ describe Sauce::Config do
       c.browser_version.should == 'BROWSER_VERSION2'
     end
   end
+
+  describe "#"
 end
 
 describe Sauce do

data/spec/sauce/config/environment_config_spec.rb

@@ -97,8 +97,8 @@ describe "Sauce::Config" do
       it "should extract the browsers" do
         opts = test_config.send(:extract_options_from_hash, browsers)
         opts[:browsers].should eq([
-          ["os1", "ie1", "version1"],
-          ["os2", "ie2", "version2"]
+          ["os1", "ie1", "version1", nil],
+          ["os2", "ie2", "version2", nil]
         ])
       end
     end

data/spec/sauce/config/perfile_browser_spec.rb

@@ -24,17 +24,17 @@ describe "Sauce::Config" do
       filename = "./features/duckduck.feature"
       fn = 14
 
-      Sauce::Config.new.browsers_for_location(filename, fn).should eq expected_browsers
+      Sauce::Config.new.caps_for_location(filename, fn).should eq expected_browsers
     end
 
     it "should return the browsers for the requested location" do
       expected_browsers = [
-        ["Linux", "Chrome", "nil"],
-        ["Mac", "Safari", "5"]
+        ["Linux", "Chrome", "nil", {}],
+        ["Mac", "Safari", "5", {}]
       ]
 
       browser_hash = expected_browsers.map { |a| 
-       {"os" => a[0], "browser" => a[1], "version" => a[2]}
+       {"os" => a[0], "browser" => a[1], "version" => a[2], "caps" => a[3]}
       }
 
       env_hash = {
@@ -49,13 +49,13 @@ describe "Sauce::Config" do
       filename = "./features/duckduck.feature"
       fn = 14
 
-      Sauce::Config.new.browsers_for_location(filename, fn).should eq expected_browsers
+      Sauce::Config.new.caps_for_location(filename, fn).should eq expected_browsers
     end
 
     it "returns the line number location if present" do
       expected_browsers = [
-        ["Linux", "Chrome", "nil"],
-        ["Mac", "Safari", "5"]
+        ["Linux", "Chrome", "nil", {}],
+        ["Mac", "Safari", "5", {}]
       ]
 
       browser_hash = expected_browsers.map { |a| 
@@ -74,13 +74,13 @@ describe "Sauce::Config" do
       filename = "./features/duckduck.feature"
       fn = 11
 
-      Sauce::Config.new.browsers_for_location(filename, fn).should eq expected_browsers
+      Sauce::Config.new.caps_for_location(filename, fn).should eq expected_browsers
     end
 
-        it "ignores line number if it can't find it" do
+    it "ignores line number if it can't find it" do
       expected_browsers = [
-        ["Linux", "Chrome", "nil"],
-        ["Mac", "Safari", "5"]
+        ["Linux", "Chrome", "nil", {}],
+        ["Mac", "Safari", "5", {}]
       ]
 
       browser_hash = expected_browsers.map { |a| 
@@ -99,7 +99,7 @@ describe "Sauce::Config" do
       filename = "./features/duckduck.feature"
       fn = 6
 
-      Sauce::Config.new.browsers_for_location(filename, fn).should eq expected_browsers
+      Sauce::Config.new.caps_for_location(filename, fn).should eq expected_browsers
     end
   end
 end

data/spec/sauce/tasks_spec.rb

@@ -103,7 +103,7 @@ describe 'parse_task_args' do
         end
 
         it 'defaults to not being present for cucumber' do
-          actual_args = parse_task_args(:cucmber, {}).join ' '
+          actual_args = parse_task_args(:cucumber, {}).join ' '
           actual_args.should_not include '-o'
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sauce
 version: !ruby/object:Gem::Version
-  version: 3.4.9
+  version: 3.5.0
 platform: ruby
 authors:
 - Dylan Lacey
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -218,14 +218,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.6
+        version: 1.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.6
+        version: 1.0.6
 - !ruby/object:Gem::Dependency
   name: sauce_whisk
   requirement: !ruby/object:Gem::Requirement
@@ -268,6 +268,7 @@ files:
 - lib/sauce/raketasks.rb
 - lib/sauce/rspec.rb
 - lib/sauce/selenium.rb
+- lib/sauce/test_base.rb
 - lib/sauce/test_unit.rb
 - lib/sauce/utilities.rb
 - lib/sauce/utilities/connect.rb