sauce 2.3.4 → 2.3.5

data/lib/generators/sauce/install/install_generator.rb

@@ -40,12 +40,12 @@ module Sauce
 require 'sauce'
 
 Sauce.config do |conf|
-    conf.browsers = [
+    conf[:browsers] = [
         ["Windows 2003", "firefox", "3.6."]
     ]
-    conf.application_host = "127.0.0.1"
-    conf.application_port = "3001"
-    conf.browser_url = "http://localhost:3001/"
+    conf[:application_host] = "127.0.0.1"
+    conf[:application_port] = "3001"
+    conf[:browser_url] = "http://localhost:3001/"
 end
           CONFIG
       end

data/lib/sauce.rb

@@ -5,3 +5,9 @@ require 'sauce/client'
 require 'sauce/config'
 require 'sauce/selenium'
 require 'sauce/integrations'
+
+module Sauce
+  def self.driver_pool
+    @@driver_pool ||= {}
+  end
+end

data/lib/sauce/capybara.rb

@@ -85,21 +85,40 @@ module Sauce
       end
 
       def browser
-        unless @browser
-          if Sauce.get_config[:start_tunnel]
-            Sauce::Capybara.connect_tunnel(:quiet => true)
-          end
-
-          @browser = Sauce::Selenium2.new
-          at_exit do
-            finish!
+        unless existing_browser?
+          unless @browser = rspec_browser
+            if Sauce.get_config[:start_tunnel]
+              Sauce::Capybara.connect_tunnel(:quiet => true)
+            end
+
+            @browser = Sauce::Selenium2.new
+            at_exit do
+              finish!
+            end
           end
         end
         @browser
       end
 
+      def rspec_browser
+        if browser = Sauce.driver_pool[Thread.current.object_id]
+          @using_rspec_browser = true
+        else
+          @using_rspec_browser = false
+        end
+        browser
+      end
+
+      def existing_browser?
+        if @using_rspec_browser
+          @browser == Sauce.driver_pool[Thread.current.object_id]
+        else
+          @browser
+        end
+      end
+
       def finish!
-        @browser.quit if @browser
+        @browser.quit if existing_browser?
         @browser = nil
         $sauce_tunnel.disconnect if $sauce_tunnel
       end

data/lib/sauce/integrations.rb

@@ -17,7 +17,7 @@ begin
         before :suite do
           config = Sauce::Config.new
           if @@need_tunnel
-            if config.application_host
+            if config[:application_host]
               @@tunnel = Sauce::Connect.new(:host => config.application_host, :port => config.application_port || 80)
               @@tunnel.connect
               @@tunnel.wait_until_ready
@@ -37,7 +37,7 @@ begin
         def execute(*args)
           config = Sauce::Config.new
           description = [self.class.description, self.description].join(" ")
-          config.browsers.each do |os, browser, version|
+          config[:browsers].each do |os, browser, version|
             @selenium = Sauce::Selenium2.new({:os => os, :browser => browser,
                                               :browser_version => version,
                                               :job_name => description})
@@ -77,10 +77,13 @@ begin
                                                 :browser => browser,
                                                 :browser_version => version,
                                                 :job_name => description})
+              Sauce.driver_pool[Thread.current.object_id] = @selenium
+
               begin
                 the_test.run
               ensure
                 @selenium.stop
+                Sauce.driver_pool.delete Thread.current.object_id
               end
             end
           end
@@ -94,7 +97,7 @@ begin
           config = Sauce::Config.new
           files_to_run = ::RSpec.configuration.respond_to?(:files_to_run) ? ::RSpec.configuration.files_to_run :
             ::RSpec.configuration.settings[:files_to_run]
-          if config.application_host
+          if config[:application_host]
             need_tunnel = files_to_run.any? {|file| file =~ /spec\/selenium\//}
           end
           if need_tunnel
@@ -138,7 +141,7 @@ module Sauce
       end
       unless my_name =~ /^default_test/
         config = Sauce::Config.new
-        if config.application_host
+        if config[:application_host]
           unless ENV['TEST_ENV_NUMBER'].to_i > 1
             Sauce::Connect.ensure_connected(:host => config.application_host, :port => config.application_port || 80)
           end
@@ -156,7 +159,7 @@ module Sauce
           end
         end
 
-        config.browsers.each do |os, browser, version|
+        config[:browsers].each do |os, browser, version|
           options = self.class.sauce_config
           options.merge!({:os => os, :browser => browser,
                           :browser_version => version,

data/spec/integration/rspec/spec/selenium/selenium_directory_spec.rb

@@ -0,0 +1,24 @@
+require "spec_helper"
+require "sauce"
+
+Sauce.config do |c|
+  c.browsers = [
+      ["Windows 2008", "iexplore", "9"],
+      ["Linux", "opera", 12]
+  ]
+end
+
+describe "Specs in the Selenium Directory" do
+
+  before :all do
+    $EXECUTIONS = 0
+  end
+
+  after :all do
+    $EXECUTIONS.should be 2
+  end
+
+  it "should get run on every defined browser" do
+    $EXECUTIONS += 1
+  end
+end

data/spec/integration/rspec/spec/selenium/selenium_with_capybara_spec.rb

@@ -0,0 +1,36 @@
+require "rspec"
+require "rspec/mocks"
+require "spec_helper"
+require "sauce/capybara"
+
+class MyRackApp
+  def self.call(env)
+    [200, {}, ["Hello"]]
+  end
+end
+
+Sauce.config do |c|
+  c.browsers = [
+      ["Windows 2008", "iexplore", "9"],
+      ["Linux", "opera", 12]
+  ]
+end
+
+Capybara.app = MyRackApp
+
+describe "The Selenium Directory with Capybara", :js => true do
+
+  include Capybara::DSL
+  it "should get run on every defined browser", :js => true do
+    visit "http://www.google.com"
+  end
+
+  it "should have the same driver as stock webdriver", :js => true do
+    Capybara.current_session.driver.browser.should eq @selenium
+  end
+
+  it "should not create a new driver" do
+    ::Sauce::Selenium2.should_not_receive(:new)
+    visit "http://wwww.google.com"
+  end
+end

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

@@ -0,0 +1,2 @@
+require "rspec"
+require "capybara/rspec"

data/spec/sauce/capybara_spec.rb

@@ -103,6 +103,72 @@ describe Sauce::Capybara do
       end
     end
 
+    describe '#rspec_browser' do
+      let(:driver) { Sauce::Capybara::Driver.new(app) }
+
+      before :each do
+        Sauce::Selenium2.stub(:new).and_return(nil)
+      end
+
+      context "with no rspec driver" do
+
+        before :each do
+          Sauce.stub(:driver_pool).and_return({})
+        end
+
+        it "should return nil" do
+          driver.rspec_browser.should be nil
+        end
+
+        it "should set the rspec_driver flag to false" do
+          driver.rspec_browser
+          driver.instance_variable_get(:@using_rspec_browser).should be_false
+        end
+
+      end
+
+      context "with an rspec driver" do
+        let(:mock_driver) {Object.new}
+        before :each do
+          Sauce.stub(:driver_pool).and_return({Thread.current.object_id => mock_driver})
+        end
+
+        it "should return the driver" do
+          driver.rspec_browser.should be mock_driver
+        end
+
+        it "should set the rspec_driver flag to true" do
+          driver.rspec_browser
+          driver.instance_variable_get(:@using_rspec_browser).should be_true
+        end
+      end
+
+      context "called after a driver_pool change" do
+
+        context "with no driver present" do
+          let(:mock_driver) {Object.new}
+
+          before (:each) do
+            Sauce.stub(:driver_pool).and_return(
+                {Thread.current.object_id => mock_driver},
+                {Thread.current.object_id => nil}
+            )
+          end
+
+          it "should return nil" do
+            driver.rspec_browser.should eq mock_driver
+            driver.rspec_browser.should be nil
+          end
+
+          it "should set rspec_browser flag false" do
+            driver.rspec_browser
+            driver.rspec_browser
+            driver.instance_variable_get(:@using_rspec_browser).should be_false
+          end
+        end
+      end
+    end
+
     describe '#browser' do
       let(:driver) { Sauce::Capybara::Driver.new(app) }
 
@@ -110,6 +176,18 @@ describe Sauce::Capybara do
         # Stub out the selenium driver startup
         Sauce::Selenium2.stub(:new).and_return(nil)
       end
+
+      context "when there is a driver in the driver pool" do
+        let(:mock_browser) {Object.new}
+        before :each do
+          Sauce.driver_pool[Thread.current.object_id] = mock_browser
+        end
+
+        it "should use the driver_pools browser" do
+          driver.browser.should eq mock_browser
+        end
+      end
+
       context 'when tunneling is disabled' do
         it 'should not call #connect_tunnel' do
           Sauce::Capybara.should_receive(:connect_tunnel).never

data/spec/sauce/config_spec.rb

@@ -57,11 +57,11 @@ describe Sauce::Config do
   describe '#os' do
     it 'should return the value set in the config block' do
       Sauce.config do |config|
-        config.os = 'TEST_OS'
+        config[:os] = 'TEST_OS'
       end
 
       c = Sauce::Config.new
-      c.os.should == 'TEST_OS'
+      c[:os].should == 'TEST_OS'
     end
   end
 
@@ -206,7 +206,7 @@ describe Sauce::Config do
     describe 'browsers=' do
       it 'should default the config to the first item' do
         Sauce.config do |config|
-          config.browsers = [['TEST_OS', 'TEST_BROWSER', 'TEST_BROWSER_VERSION']]
+          config[:browsers] = [['TEST_OS', 'TEST_BROWSER', 'TEST_BROWSER_VERSION']]
         end
 
         c = Sauce::Config.new
@@ -228,7 +228,7 @@ describe Sauce::Config do
 
     it 'should allow overrides as constructor options' do
       Sauce.config do |config|
-        config.browsers = [['OS1', 'BROWSER1', 'BROWSER_VERSION1']]
+        config[:browsers] = [['OS1', 'BROWSER1', 'BROWSER_VERSION1']]
       end
 
       c = Sauce::Config.new(:os => 'OS2', :browser => 'BROWSER2',

data/spec/sauce/driver_pool_spec.rb

@@ -0,0 +1,8 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "DriverPool" do
+
+  it "should be a hash" do
+    Sauce.driver_pool.should be_an_instance_of Hash
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sauce
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
@@ -183,9 +183,13 @@ files:
 - lib/sauce.rb
 - spec/cucumber_helper.rb
 - spec/integration/connect_integration_spec.rb
+- spec/integration/rspec/spec/selenium/selenium_directory_spec.rb
+- spec/integration/rspec/spec/selenium/selenium_with_capybara_spec.rb
+- spec/integration/rspec/spec/spec_helper.rb
 - spec/sauce/capybara_spec.rb
 - spec/sauce/config_spec.rb
 - spec/sauce/cucumber_spec.rb
+- spec/sauce/driver_pool_spec.rb
 - spec/sauce/jasmine_spec.rb
 - spec/sauce/selenium_spec.rb
 - spec/spec_helper.rb
@@ -204,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2889318563939788331
+      hash: -1836059849841492535
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -213,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2889318563939788331
+      hash: -1836059849841492535
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -223,9 +227,13 @@ summary: A Ruby helper for running tests in Sauce Labs
 test_files:
 - spec/cucumber_helper.rb
 - spec/integration/connect_integration_spec.rb
+- spec/integration/rspec/spec/selenium/selenium_directory_spec.rb
+- spec/integration/rspec/spec/selenium/selenium_with_capybara_spec.rb
+- spec/integration/rspec/spec/spec_helper.rb
 - spec/sauce/capybara_spec.rb
 - spec/sauce/config_spec.rb
 - spec/sauce/cucumber_spec.rb
+- spec/sauce/driver_pool_spec.rb
 - spec/sauce/jasmine_spec.rb
 - spec/sauce/selenium_spec.rb
 - spec/spec_helper.rb