sauce 3.1.2 → 3.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2U0MmM0ZDc3ZDU3ZjIyYTlkYzQ4MzAyM2YxMzgzNmI2MWZjZGZmOA==
+    N2JjYzUwNDFiY2E4NDk2ZWY3ODY2MjliMzE4YzUyMDlmYzA0Yzc1ZQ==
   data.tar.gz: !binary |-
-    ZDAyMzRiOWZkZDVlYjQzOTE1NmM0YWZhODMxYzFiYTYyNDY3YWRiOA==
+    N2Q2OTJlZTM3ODIzMjU2ZTM3ZGIzOWNiYmU5NTVlYWI0NDI0NTg0ZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjA4MGU4ZWU5MGEwZmZkOWI2YmNmMjQ5YjZlYTVlZjhmZTMxMDY3M2NjZGI5
-    NDA2YjNlOTA5NWZmYTFmM2NhZjJlOTdkY2ViOTk4YTRmMmU3NDhjMDBkYWU5
-    MDU2M2Q3MzUwMjNjZGVjNzZiNzc2ZDRlZWViMjViMTI3MzhiMTQ=
+    ZGMyODQ0YWZmZmE5NDA2Nzk2Y2QwY2MwZWFmZDM5MWE5NDNkMjY3MDhkMTNk
+    YjAwZGExMDRkZWE0NTBkZjFlNTkwZDRhNTk3ZTgwNTEzMzBiNzUyZGU0MjE3
+    NzIzMDkwNjgxZGRlZGUxY2ViM2FiMTM5NDA4OTU0OTZkOGI0ZWE=
   data.tar.gz: !binary |-
-    NDA2ZmFmMTE3ZmFjZTU0ZGFhNDdmMTYzYjRjMTdlNTMwNzFmZTJhMDY5ZjQ4
-    MTcxODlkNzM5YTdjNDRkYTM4YTczYWRlMjYwODY5MjJjODEzNWE1NzFkNTJh
-    NTg1ZDVhNDhkZmVkMzBjNzBiYmZhYzI0NzYxN2ExZTgxYmRkYTg=
+    Zjg5Mjk4Zjg4YjhkYjVjOTU1ZTE3MWU1NjM5MWNhY2I2ZDRkOWQxMWEyYWIw
+    Nzc1NTkyZTkwNWEyOTkwZGQxM2VhM2MxZTBhMGNjNjRiMmIzZmUwOGU5ZDhi
+    Y2JjYjZmZDBmZGIyNWY3NzkyZDMxN2EwNGQzOTg5YWQxZTE3YmQ=

data/lib/sauce/capybara.rb

@@ -119,7 +119,7 @@ module Sauce
 end
 
 Capybara.register_driver :sauce do |app|
-  Sauce::Capybara::Driver.new(app)
+  driver = Sauce::Capybara::Driver.new(app)
 end
 
 # Monkeypatch Capybara to not use :selenium driver

data/lib/sauce/config.rb

@@ -66,7 +66,7 @@ module Sauce
         sauce-advisor single-window user-extensions-url firefox-profile-url
         max-duration idle-timeout build custom-data tunnel-identifier
         selenium-version command-timeout prerun prerun-args screen-resolution
-        disable-popup-handler avoid-proxy public}
+        disable-popup-handler avoid-proxy public name}
 
     def self.get_application_port
       port_index = ENV["TEST_ENV_NUMBER"].to_i
@@ -83,7 +83,7 @@ module Sauce
 
         @undefaulted_opts.merge! load_options_from_yaml
         @undefaulted_opts.merge! load_options_from_environment
-        @undefaulted_opts.merge! load_options_from_heroku
+        @undefaulted_opts.merge! load_options_from_heroku unless ENV["SAUCE_DISABLE_HEROKU_CONFIG"]
         @undefaulted_opts.merge! Sauce.get_config.opts rescue {}
         @undefaulted_opts.merge! opts
         @opts.merge! @undefaulted_opts
@@ -143,7 +143,7 @@ module Sauce
         :browserName => BROWSERS[browser] || browser,
         :version => browser_version,
         :platform => PLATFORMS[os] || os,
-        :name => @opts[:job_name],
+        :name =>@opts[:job_name],
         :client_version => client_version
       }
 

data/lib/sauce/selenium.rb

@@ -35,6 +35,11 @@ module Sauce
                       :desired_capabilities => @config.to_desired_capabilities,
                       :http_client => http_client)
       http_client.timeout = 90 # Once the browser is up, commands should time out reasonably
+
+      @driver.file_detector = lambda do |args|
+        file_path = args.first.to_s
+        File.exist?(file_path) ? file_path : false
+      end
     end
 
     def method_missing(meth, *args)

data/lib/sauce/test_unit.rb

@@ -89,8 +89,8 @@ if defined?(ActiveSupport::TestCase)
 end
 
 begin
-  if Object.const_defined? "Test"
-    if Test.const_defined? "Unit"
+  if Object.const_defined? :Test
+    if Test.const_defined? :Unit
       require 'test/unit/testcase'
       module Sauce
         class TestCase < Test::Unit::TestCase

data/lib/sauce/version.rb

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

data/spec/sauce/config/config_spec.rb

@@ -203,6 +203,14 @@ describe Sauce::Config do
       end
     end
 
+    context 'with a :name set' do
+      subject do
+        Sauce::Config.new(:name => 'As Sweet').to_desired_capabilities[:name]
+      end
+
+      it {should eq "As Sweet"}
+    end
+
     context 'platforms' do
       it 'should refer to Windows 2003 as WINDOWS' do
         config = Sauce::Config.new(:os => "Windows 2003")

data/spec/sauce/file_detector_spec.rb

@@ -0,0 +1,15 @@
+require "spec_helper"
+
+describe Sauce::Selenium2 do
+  describe "#file_detector" do
+    it "should return the path of files when they exist" do
+      Selenium::WebDriver::Remote::Bridge.any_instance.stub(:create_session).and_return({})
+
+      path = __FILE__
+
+      client = Sauce::Selenium2.new()
+      bridge = client.driver.instance_variable_get(:@bridge)
+      bridge.file_detector.call([path]).should eq path
+    end
+  end
+end

data/spec/sauce/selenium_spec.rb

@@ -1,56 +1,59 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Sauce::Selenium2 do
-  let(:mock_driver) { Hash.new }
+  describe "itself" do
 
-  before :each do
-    ::Selenium::WebDriver.should_receive(:for).and_return(mock_driver)
-  end
-
-  describe '#initialize' do
-    it 'should work without arguments' do
-      client = Sauce::Selenium2.new
-      client.should_not be nil
+    before :each do
+      mock_driver = double(::Selenium::WebDriver::Driver)
+      mock_driver.stub(:file_detector=)
+      ::Selenium::WebDriver.should_receive(:for).and_return(mock_driver)
     end
 
-    it 'should pass the job_name argument into the config' do
-      expected = 'Dummy Job Name'
-      client = Sauce::Selenium2.new(:job_name => expected)
-      client.config[:job_name].should == expected
+    describe '#initialize' do
+      it 'should work without arguments' do
+        client = Sauce::Selenium2.new
+        client.should_not be nil
+      end
+
+      it 'should pass the job_name argument into the config' do
+        expected = 'Dummy Job Name'
+        client = Sauce::Selenium2.new(:job_name => expected)
+        client.config[:job_name].should == expected
+      end
     end
-  end
 
 
-  context 'with an initialized object' do
-    before :each do
-      @client = Sauce::Selenium2.new
-    end
+    context 'with an initialized object' do
+      before :each do
+        @client = Sauce::Selenium2.new
+      end
 
-    describe '#stop' do
-      it 'should call quit on the driver' do
-        @client.driver.should_receive(:quit).and_return(true)
-        @client.stop
+      describe '#stop' do
+        it 'should call quit on the driver' do
+          @client.driver.should_receive(:quit).and_return(true)
+          @client.stop
+        end
       end
-    end
 
-    describe '#session_id' do
-      it 'should query the driver for the session_id' do
-        expected = 101
-        bridge = double('bridge')
-        bridge.should_receive(:session_id).and_return(expected)
-        @client.driver.should_receive(:bridge).and_return(bridge)
-        @client.session_id.should == expected
+      describe '#session_id' do
+        it 'should query the driver for the session_id' do
+          expected = 101
+          bridge = double('bridge')
+          bridge.should_receive(:session_id).and_return(expected)
+          @client.driver.should_receive(:bridge).and_return(bridge)
+          @client.session_id.should == expected
+        end
       end
-    end
 
-    describe '#method_missing' do
-      it 'should pass #navigate#to onto the driver' do
-        url = 'http://example.com'
-        navigator = double('navigator')
-        navigator.should_receive(:to).with(url).and_return(true)
-        @client.driver.should_receive(:navigate).and_return(navigator)
+      describe '#method_missing' do
+        it 'should pass #navigate#to onto the driver' do
+          url = 'http://example.com'
+          navigator = double('navigator')
+          navigator.should_receive(:to).with(url).and_return(true)
+          @client.driver.should_receive(:navigate).and_return(navigator)
 
-        @client.navigate.to url
+          @client.navigate.to url
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sauce
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - Dylan Lacey
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -264,6 +264,7 @@ files:
 - spec/sauce/config/load_defaults_spec.rb
 - spec/sauce/cucumber_spec.rb
 - spec/sauce/driver_pool_spec.rb
+- spec/sauce/file_detector_spec.rb
 - spec/sauce/jasmine_spec.rb
 - spec/sauce/parallel/test_broker_spec.rb
 - spec/sauce/selenium_spec.rb
@@ -317,6 +318,7 @@ test_files:
 - spec/sauce/config/load_defaults_spec.rb
 - spec/sauce/cucumber_spec.rb
 - spec/sauce/driver_pool_spec.rb
+- spec/sauce/file_detector_spec.rb
 - spec/sauce/jasmine_spec.rb
 - spec/sauce/parallel/test_broker_spec.rb
 - spec/sauce/selenium_spec.rb