sauce 2.3.2 → 2.3.3

data/bin/sauce

@@ -46,7 +46,7 @@ class ConfigureCommand < CmdParse::Command
   end
 end
 configure = ConfigureCommand.new('configure', false)
-configure.short_desc = "Configure Sauce OnDemand credentials"
+configure.short_desc = "Configure Sauce Labs credentials"
 configure.set_execution_block do |args|
   if args.length < 2
     puts configure.usage
@@ -65,7 +65,7 @@ cmd.add_command(configure)
 
 #create
 create = CmdParse::Command.new('create', false)
-create.short_desc = "Create a new Sauce OnDemand account"
+create.short_desc = "Create a new Sauce Labs account"
 create.set_execution_block do |args|
   puts "Let's create a new account!"
   username = ask("Username: ")

data/lib/sauce/capybara.rb

@@ -60,14 +60,25 @@ module Sauce
       alias :base_within_frame :within_frame
       alias :base_within_window :within_window
       alias :base_find_window :find_window
-      alias :base_body :body
-      alias :base_source :source
       alias :base_execute_script :execute_script
       alias :base_evaluate_script :evaluate_script
 
-      [:find, :visit, :current_url, :reset!, :within_frame,
-       :within_window, :find_window, :body, :source,
-       :execute_script, :evaluate_script].each do |method|
+      @methods_to_retry = [ :find, :visit, :current_url, :reset!,
+        :within_frame, :within_window, :find_window, :source,
+        :execute_script, :evaluate_script
+      ]
+
+      if Gem::Version.new(::Capybara::VERSION) < Gem::Version.new(2)
+        alias :base_body :body
+        alias :base_source :source
+
+        @methods_to_retry + [:body, :source]
+      else
+        alias :base_html :html
+        @methods_to_retry + [:html]
+      end
+
+      @methods_to_retry.each do |method|
         define_method(method) do |*args, &block|
           handle_retry(method, *args, &block)
         end

data/lib/sauce/config.rb

@@ -34,7 +34,7 @@ module Sauce
     ENVIRONMENT_VARIABLES = %w{SAUCE_HOST SAUCE_PORT SAUCE_BROWSER_URL SAUCE_USERNAME
         SAUCE_ACCESS_KEY SAUCE_OS SAUCE_BROWSER SAUCE_BROWSER_VERSION SAUCE_JOB_NAME
         SAUCE_FIREFOX_PROFILE_URL SAUCE_USER_EXTENSIONS_URL
-        SAUCE_ONDEMAND_BROWSERS SAUCE_USERNAME SAUCE_API_KEY}
+        SAUCE_ONDEMAND_BROWSERS SAUCE_USER_NAME SAUCE_API_KEY}
 
     PLATFORMS = {
       "Windows 2003" => "WINDOWS",

data/lib/sauce/parallel.rb

@@ -0,0 +1,16 @@
+require 'parallel_tests'
+
+def start_tunnel_for_parallel_tests(c)
+  c[:start_tunnel] = ParallelTests.first_process?
+  if ParallelTests.first_process?
+    at_exit do
+      if ParallelTests.first_process?
+        ParallelTests.wait_for_other_processes_to_finish
+      end
+    end
+  else
+    while not File.exist? "sauce_connect.ready"
+      sleep 0.5
+    end
+  end
+end

data/spec/sauce/capybara_spec.rb

@@ -42,6 +42,48 @@ describe Sauce::Capybara do
     let(:app) { double('Mock App for Driver') }
     let(:driver) { Sauce::Capybara::Driver.new(app) }
 
+    describe "#body" do
+      context "With Capybara 1.x", :capybara_version => 1 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
+        it "should not exist" do
+          driver.should_not respond_to :base_body
+        end
+      end
+    end
+
+    describe "#source" do
+      context "With Capybara 1", :capybara_version => 1  do
+        it "should exist" do
+          driver.should respond_to :base_source
+        end
+      end
+
+      context "with Capybara 2.x", :capybara_version => 2 do
+        it "should not exist" do
+          driver.should_not respond_to :base_source
+        end
+      end
+    end
+
+    describe "#html" do
+      context "With Capybara 1.x", :capybara_version => 1 do
+        it "should not exist" do
+          driver.should_not respond_to :base_html
+        end
+      end
+
+      context "With Capybara 2.x", :capybara_version => 2 do
+        it "should exist" do
+          driver.should respond_to :base_html
+        end
+      end
+    end
+
     describe '#finish' do
       let(:browser) { double('Sauce::Selenium2 mock') }
 

data/spec/sauce/config_spec.rb

@@ -104,12 +104,12 @@ describe Sauce::Config do
     end
 
     it 'should create a browser string from the environment set by the jenkins plugin' do
-      ENV['SAUCE_USER_NAME'] = 'test_user'
-      ENV['SAUCE_API_KEY'] = 'test_access'
+      ENV['SAUCE_USERNAME'] = 'test_user'
+      ENV['SAUCE_ACCESS_KEY'] = 'test_access'
       ENV['SAUCE_OS'] = 'Linux'
       ENV['SAUCE_BROWSER'] = 'firefox'
       ENV['SAUCE_BROWSER_VERSION'] = '3.'
-      ENV['JOB_NAME'] = 'Named Ruby Job'
+      ENV['SAUCE_JOB_NAME'] = 'Named Ruby Job'
 
       config = Sauce::Config.new
       browser_data = JSON.parse(config.to_browser_string)
@@ -241,6 +241,12 @@ describe Sauce::Config do
 end
 
 describe Sauce do
+
+  # Ensure any doubles are removed to stop other tests choking
+  after :all do
+    Sauce.clear_config
+  end
+
   describe '#get_config' do
     context 'when #config has never been called' do
       # See: <https://github.com/sauce-labs/sauce_ruby/issues/59>
@@ -250,10 +256,6 @@ describe Sauce do
         Sauce.instance_variable_set(:@cfg, nil)
       end
 
-      after :all do
-
-      end
-
       it 'should return a newly created Sauce::Config' do
         dummy_config = double('Sauce::Config')
         Sauce::Config.should_receive(:new).and_return(dummy_config)

data/spec/spec_helper.rb

@@ -5,4 +5,12 @@ $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 end
 
 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
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sauce
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
@@ -32,22 +32,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -176,8 +160,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.0
-description: A Ruby helper for running tests in Sauce OnDemand, Sauce Labs' browsers
-  in the cloud service
+description: A Ruby helper for running tests in Sauce Labs' browser testing cloud
+  service
 email: help@saucelabs.com
 executables:
 - sauce
@@ -191,6 +175,7 @@ files:
 - lib/sauce/heroku.rb
 - lib/sauce/integrations.rb
 - lib/sauce/job.rb
+- lib/sauce/parallel.rb
 - lib/sauce/raketasks.rb
 - lib/sauce/selenium.rb
 - lib/sauce/utilities.rb
@@ -225,10 +210,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: A Ruby helper for running tests in Sauce OnDemand
+summary: A Ruby helper for running tests in Sauce Labs
 test_files:
 - spec/cucumber_helper.rb
 - spec/integration/connect_integration_spec.rb