sauce 2.4.2 → 2.4.3

data/lib/sauce/capybara.rb

@@ -53,7 +53,6 @@ module Sauce
         end
       end
 
-      alias :base_find :find
       alias :base_visit :visit
       alias :base_current_url :current_url
       alias :base_reset! :reset!
@@ -63,11 +62,20 @@ module Sauce
       alias :base_execute_script :execute_script
       alias :base_evaluate_script :evaluate_script
 
-      @methods_to_retry = [ :find, :visit, :current_url, :reset!,
+      @methods_to_retry = [:visit, :current_url, :reset!,
         :within_frame, :within_window, :find_window, :source,
         :execute_script, :evaluate_script
       ]
 
+      if method_defined? :find
+        alias :base_find :find
+        @methods_to_retry += [:find]
+      else
+        alias :base_find_css :find_css
+        alias :base_find_xpath :find_xpath
+        @methods_to_retry += [:find_css, :find_xpath]
+      end
+
       if Gem::Version.new(::Capybara::VERSION) < Gem::Version.new(2)
         alias :base_body :body
         alias :base_source :source
@@ -122,6 +130,11 @@ module Sauce
         @browser = nil
         $sauce_tunnel.disconnect if $sauce_tunnel
       end
+
+      def render(path)
+        browser.save_screenshot path
+      end
+        
     end
   end
 end

data/lib/sauce/config.rb

@@ -113,7 +113,8 @@ 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
       }.update(@opts.reject {|k, v| [:browser, :browser_version, :os, :job_name].include? k})
     end
 
@@ -180,8 +181,31 @@ module Sauce
       @opts[:port]
     end
 
+    def tools
+      tools = []
+      tools << "Rspec" if is_defined? "RSpec"
+      tools << "Capybara" if is_defined? "Capybara"
+      tools << "Cucumber" if is_defined? "Cucumber"
+      tools << "Test::Unit" if is_defined?("Test", "Unit")
+      tools
+    end
+
+    # Only here to be stubbed for testing.  Gross.
+    def is_defined? (top_mod, sub_mod = nil)
+      return_value = Object.const_defined? top_mod
+      unless !return_value || sub_mod.nil?
+        return_value = Object.const_get(top_mod).const_defined? sub_mod
+      end
+
+      return_value
+    end
+
     private
 
+    def client_version
+      "Ruby: #{RUBY_ENGINE} #{RUBY_VERSION} (#{RUBY_PLATFORM}) Sauce gem: #{Sauce.version} Tools: #{tools.to_s}"
+    end
+
     def load_options_from_environment
       return extract_options_from_hash(ENV)
     end

data/lib/sauce/version.rb

@@ -1,4 +1,9 @@
-
 module Sauce
   MAJOR_VERSION = '2.4'
+  PATCH_VERSION = '3'
+
+  def version
+    "#{MAJOR_VERSION}.#{PATCH_VERSION}"
+  end
+  module_function :version
 end

data/spec/integration/rspec/spec/spec_helper.rb

@@ -1,2 +1,3 @@
 require "rspec"
 require "capybara/rspec"
+require "sauce"

data/spec/sauce/capybara_spec.rb

@@ -43,13 +43,13 @@ describe Sauce::Capybara do
     let(:driver) { Sauce::Capybara::Driver.new(app) }
 
     describe "#body" do
-      context "With Capybara 1.x", :capybara_version => 1 do
+      context "With Capybara 1.x", :capybara_version => [1, "1.9.9"] do
         it "should not exist in version 2" do
           driver.should respond_to :base_body
         end
       end
 
-      context "With Capybara 2.x", :capybara_version => 2 do
+      context "With Capybara 2.x", :capybara_version => [2, "2.9.9"] do
         it "should not exist" do
           driver.should_not respond_to :base_body
         end
@@ -57,13 +57,13 @@ describe Sauce::Capybara do
     end
 
     describe "#source" do
-      context "With Capybara 1", :capybara_version => 1  do
+      context "With Capybara 1", :capybara_version => [1, "1.9.9"]  do
         it "should exist" do
           driver.should respond_to :base_source
         end
       end
 
-      context "with Capybara 2.x", :capybara_version => 2 do
+      context "with Capybara 2.x", :capybara_version => [2, "2.9.9"] do
         it "should not exist" do
           driver.should_not respond_to :base_source
         end
@@ -71,13 +71,13 @@ describe Sauce::Capybara do
     end
 
     describe "#html" do
-      context "With Capybara 1.x", :capybara_version => 1 do
+      context "With Capybara 1.x", :capybara_version => [1, "1.9.9"] do
         it "should not exist" do
           driver.should_not respond_to :base_html
         end
       end
 
-      context "With Capybara 2.x", :capybara_version => 2 do
+      context "With Capybara 2.x", :capybara_version => [2, "2.9.9"] do
         it "should exist" do
           driver.should respond_to :base_html
         end
@@ -201,35 +201,96 @@ describe Sauce::Capybara do
     describe '#find' do
       let(:selector) { '#lol' }
 
-      context 'with an environment override' do
-        before :each do
-          ENV['SAUCE_DISABLE_RETRY'] = '1'
+      context "with Capybara < 2.1", :capybara_version => [2, "2.0.9"] do
+
+        it "should exist" do
+          driver.respond_to?(:find).should be_true
+        end
+
+        context 'with an environment override' do
+          before :each do
+            ENV['SAUCE_DISABLE_RETRY'] = '1'
+          end
+
+          it 'should not retry and raise the error' do
+            driver.should_receive(:base_find).with(selector).and_raise(Selenium::WebDriver::Error::UnknownError)
+
+            expect {
+              driver.find(selector)
+            }.to raise_error(Selenium::WebDriver::Error::UnknownError)
+          end
+
+          after :each do
+            ENV['SAUCE_DISABLE_RETRY'] = nil
+          end
+        end
+
+        it 'should route through handle_retry' do
+          driver.should_receive(:base_find).with(selector) # BLECH
+          driver.find(selector)
         end
 
-        it 'should not retry and raise the error' do
-          driver.should_receive(:base_find).with(selector).and_raise(Selenium::WebDriver::Error::UnknownError)
+        it 'should retry 3 times and then raise' do
+          driver.should_receive(:base_find).with(selector).exactly(4).times.and_raise(Selenium::WebDriver::Error::UnknownError)
 
           expect {
             driver.find(selector)
           }.to raise_error(Selenium::WebDriver::Error::UnknownError)
         end
+      end
+
+      context "with Capybara => 2.1", :capybara_version => ["2.1", "2.9.9"] do
+        it "should not be aliased" do
+          driver.respond_to?(:base_find).should be_false
+        end
 
-        after :each do
-          ENV['SAUCE_DISABLE_RETRY'] = nil
+        it "should not be retried" do
+          Sauce::Capybara::Driver.instance_variable_get(:@methods_to_retry).should_not include :find
         end
       end
+    end
 
-      it 'should route through handle_retry' do
-        driver.should_receive(:base_find).with(selector) # BLECH
-        driver.find(selector)
+    describe "#find_css" do
+      context "with Capybara < 2.1", :capybara_version => [0, "2.0.9"] do
+        it "should not be aliased" do
+          driver.respond_to?(:base_find_css).should be_false
+        end
+
+        it "should not be retried" do
+          Sauce::Capybara::Driver.instance_variable_get(:@methods_to_retry).should_not include :find_css
+        end
       end
 
-      it 'should retry 3 times and then raise' do
-        driver.should_receive(:base_find).with(selector).exactly(4).times.and_raise(Selenium::WebDriver::Error::UnknownError)
+      context "with Capybara >= 2.1", :capybara_version => ["2.1", "2.9.9"] do
+        it "should be aliased" do
+          driver.respond_to?(:base_find_css).should be_true
+        end
 
-        expect {
-          driver.find(selector)
-        }.to raise_error(Selenium::WebDriver::Error::UnknownError)
+        it "should be retried" do
+          Sauce::Capybara::Driver.instance_variable_get(:@methods_to_retry).should include :find_css
+        end
+      end
+    end
+
+    describe "#find_xpath" do
+      context "with Capybara < 2.1",  :capybara_version => [0, "2.0.9"] do
+        it "should not be aliased" do
+          driver.respond_to?(:base_find_xpath).should be_false
+        end
+
+        it "should not be retried" do
+          Sauce::Capybara::Driver.instance_variable_get(:@methods_to_retry).should_not include :find_xpath
+        end
+      end
+
+      context "with Capybara >= 2.1", :capybara_version => ["2.1", "2.9.9"] do
+        it "should be aliased" do
+          driver.respond_to?(:base_find_xpath).should be_true
+        end
+
+        it "should be retried" do
+          Sauce::Capybara::Driver.instance_variable_get(:@methods_to_retry).should include :find_xpath
+        end
       end
     end
 

data/spec/sauce/config_spec.rb

@@ -195,6 +195,72 @@ describe Sauce::Config do
         config.to_desired_capabilities[:platform].should == 'VISTA'
       end
     end
+
+    context 'client_version' do
+      let(:config) {Sauce::Config.new()}
+
+      it 'should include the Ruby engine' do
+        config.to_desired_capabilities[:client_version].should include RUBY_ENGINE
+      end
+
+      it "should include the ruby platform" do
+        config.to_desired_capabilities[:client_version].should include RUBY_PLATFORM
+      end
+
+      it "should include the ruby version" do
+        config.to_desired_capabilities[:client_version].should include RUBY_VERSION
+      end
+
+      it "should include the gem version" do
+        config.to_desired_capabilities[:client_version].should include Sauce.version
+      end
+
+      it "should include a bracketed array of tools in use" do
+        config.to_desired_capabilities[:client_version].should include config.tools.to_s
+      end
+    end
+
+    describe "#tools" do
+      let(:config) {Sauce::Config.new}
+
+      before :each do
+        config.stub(:is_defined?).and_call_original
+      end
+
+      it "should include rspec if present" do
+        config.tools.should include "Rspec"
+      end
+
+      it "should include capybara" do
+        config.stub(:is_defined?).with("Capybara") {true}
+        config.tools.should include "Capybara"
+      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
   end
 
   context 'configuring Sauce' do

data/spec/spec_helper.rb

@@ -8,9 +8,11 @@ require 'sauce'
 require 'capybara'
 
 RSpec.configure do |c|
-  if Gem::Version.new(Capybara::VERSION) < Gem::Version.new(2)
-    c.filter_run_excluding :capybara_version => 2
-  else
-    c.filter_run_excluding :capybara_version => 1
-  end
+  c.filter_run_excluding :capybara_version => lambda { |capybara_version_range|
+    actual_version = Gem::Version.new Capybara::VERSION
+    lower_bound = Gem::Version.new capybara_version_range[0]
+    upper_bound = Gem::Version.new capybara_version_range[1]
+
+    !actual_version.between?(lower_bound, upper_bound)
+  }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sauce
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -14,8 +14,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-04-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +226,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4030040488753924047
+      hash: -4599655559509497330
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -219,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4030040488753924047
+      hash: -4599655559509497330
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25