sauce 2.3.6 → 2.4.0

data/lib/sauce/integrations.rb

@@ -92,6 +92,23 @@ begin
         ::RSpec.configuration.include(self, :example_group => {
               :file_path => Regexp.compile('spec[\\\/]selenium')
             })
+        ::RSpec.configuration.include(self, :sauce => true)
+
+        ::RSpec.configuration.before(:suite, sauce: true) do
+
+          config = Sauce::Config.new
+          if config[:application_host]
+            @@tunnel ||= Sauce::Connect.new(:host => config.application_host, :port => config.application_port || 80)
+            @@tunnel.connect
+            @@tunnel.wait_until_ready
+          end
+
+          if Sauce::Utilities::RailsServer.is_rails_app?
+            @@server = Sauce::Utilities::RailsServer.new
+            @@server.start
+          end
+        end
+
         ::RSpec.configuration.before :suite do
           need_tunnel = false
           config = Sauce::Config.new
@@ -101,7 +118,7 @@ begin
             need_tunnel = files_to_run.any? {|file| file =~ /spec\/selenium\//}
           end
           if need_tunnel
-            @@tunnel = Sauce::Connect.new(:host => config.application_host, :port => config.application_port || 80)
+            @@tunnel ||= Sauce::Connect.new(:host => config.application_host, :port => config.application_port || 80)
             @@tunnel.connect
             @@tunnel.wait_until_ready
           end

data/lib/sauce/selenium.rb

@@ -5,6 +5,22 @@ require "selenium/webdriver"
 
 require 'selenium/webdriver/remote/http/persistent'
 
+module Selenium
+  module WebDriver
+    class Proxy
+      class << self
+        alias :existing_json_create :json_create
+
+        def json_create(data)
+          dup = data.dup.delete_if {|k,v| v.nil?}
+          dup.delete_if {|k,v| k == "autodetect" && v == false}
+          existing_json_create(dup)
+        end
+      end
+    end
+  end
+end
+
 
 module Sauce
   class Selenium2

data/lib/sauce/version.rb

@@ -1,4 +1,4 @@
 
 module Sauce
-  MAJOR_VERSION = '2.3'
+  MAJOR_VERSION = '2.4'
 end

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

@@ -1,11 +1,14 @@
 require "spec_helper"
 require "sauce"
+require "sauce/connect"
 
 Sauce.config do |c|
   c.browsers = [
       ["Windows 2008", "iexplore", "9"],
       ["Linux", "opera", 12]
   ]
+
+  c[:application_host] = "localhost"
 end
 
 describe "Specs in the Selenium Directory" do
@@ -21,4 +24,23 @@ describe "Specs in the Selenium Directory" do
   it "should get run on every defined browser" do
     $EXECUTIONS += 1
   end
+
+  it "should be using Sauce Connect" do
+    Sauce::RSpec::SeleniumExampleGroup.class_variable_defined?(:@@tunnel).should be_true
+  end
+end
+
+describe "Specs in the Selenium Directory with the sauce tag", :sauce => true 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/tagging/selenium_tagging_spec.rb

@@ -0,0 +1,44 @@
+require "spec_helper"
+require "sauce"
+require "sauce/connect"
+
+Sauce.config do |c|
+  c.browsers = [
+      ["Windows 2008", "iexplore", "9"],
+      ["Linux", "opera", 12]
+  ]
+  c[:application_host] = "localhost"
+end
+
+describe "Specs with the @sauce tag", :sauce => true do
+
+  before :all do
+    $TAGGED_EXECUTIONS = 0
+  end
+
+  after :all do
+    $TAGGED_EXECUTIONS.should eq 2
+  end
+
+  it "should get run on every defined browser" do
+    $TAGGED_EXECUTIONS += 1
+  end
+
+  it "should be using Sauce Connect" do
+    Sauce::RSpec::SeleniumExampleGroup.class_variable_defined?(:@@tunnel).should be_true
+  end
+end
+
+describe "Specs without the @sauce tag" do
+  before :all do
+    $UNTAGGED_EXECUTIONS = 0
+  end
+
+  after :all do
+    $UNTAGGED_EXECUTIONS.should eq 1
+  end
+
+  it "should only run once" do
+    $UNTAGGED_EXECUTIONS += 1
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sauce
 version: !ruby/object:Gem::Version
-  version: 2.3.6
+  version: 2.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
@@ -187,6 +187,7 @@ files:
 - 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/integration/rspec/spec/tagging/selenium_tagging_spec.rb
 - spec/sauce/capybara_spec.rb
 - spec/sauce/config_spec.rb
 - spec/sauce/cucumber_spec.rb
@@ -209,7 +210,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4220587224725148090
+      hash: -3397943602481883136
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -218,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4220587224725148090
+      hash: -3397943602481883136
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -231,6 +232,7 @@ test_files:
 - 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/integration/rspec/spec/tagging/selenium_tagging_spec.rb
 - spec/sauce/capybara_spec.rb
 - spec/sauce/config_spec.rb
 - spec/sauce/cucumber_spec.rb