sauce 3.3.2 → 3.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTRjZmYwYjIzOWJlNThiNWRhOTQ2ZjE1NmFkMjNhYmI5ZGQxZmE1OQ==
+    OWIzMDNhNjYzZGQ5ZmMyMDY0YmEzYzY4NTE1NjRlYWQxMDk0NGVlMw==
   data.tar.gz: !binary |-
-    MjI5MjliMzM0OTI1YjU0ZWY0OGFmYzZlYzBmMTIzZDkwZDE5NTc5ZQ==
+    ZWVjMDM0NjE2MTQzYmRmMzFmOGNhY2U0MDJmMzI2MmFlNzI3YmRjMg==
 SHA512:
   metadata.gz: !binary |-
-    MzJiM2ExNTAyZGE2YzJmYjIwMzkwYWQxYTdhODljYzE4NDcyOTRlZWRmZGE3
-    ODM4MTJjYTUxMGMyY2RkZjZmYzJkMGZkMjc2ZTU1ODA5NDkyZjY5OWM2MGMz
-    YTJiZmIyNmI5OWI2MWFkNDkyMTZjODVkZTJlMzMzM2U1ZTBmNGU=
+    YWM4NTFiZDg1MzQ2OTQ1M2E4MzQyNjYzYzlhZjJiZjNmNzQxNTYxNDdhNzRl
+    N2U5MDdiZDY5Mjg5MjQ0ODM0MWQ3MmYyMjk0MDRhNWMyM2U1ZjEyNDY1NzBi
+    N2U2M2E4Y2FjYjA0YjIwMTRjZjA3NmEwMzljMDQ3MzAwNzA2ODE=
   data.tar.gz: !binary |-
-    NDRjMWQwOThkYjliZWRkZGJiODFiNzhlNTljODgzNzJmYzczY2ZiODMzYzFm
-    MWFlNjJkMmRhMWQ5YzRkODA1MmI5Y2VlM2QxMWRiYzMzYjEwZTQ4MGY1MTVi
-    MTFkNGU1NjJhOTMyMjcwMmEwOTk2Mjg2YmViNWY4NTZkNTUwZDc=
+    NjhlNmRlNDk5Y2IzMzdhZGJhZTAwYjc3NDU2ZTU1NzEzMmYwN2IwMTlkOGU1
+    MTg0NGVhY2NkYzZjNjEzOWVjZDM1MjUyOWVlNGI5MGRlYjhhMTI0YzY4OGE3
+    MDM4OWZjYWZmMWM1ZmQxODczZDIwYzI2OWE2OTVjZGI0OTlhNjQ=

data/lib/sauce/capybara.rb

@@ -129,13 +129,15 @@ module Sauce
         require "rspec/core"
         ::RSpec.configure do |config|
           config.before :suite do 
-            ::Capybara.configure do |config|
+            ::Capybara.configure do |capy_config|
               sauce_config = Sauce::Config.new
-              if sauce_config[:start_local_application]
-                host = sauce_config[:application_host] || "127.0.0.1"
-                port = sauce_config[:application_port]
-                config.app_host = "http://#{host}:#{port}"
-                config.run_server = false
+              if capy_config.app_host.nil?
+                if sauce_config[:start_local_application]
+                  host = sauce_config[:application_host] || "127.0.0.1"
+                  port = sauce_config[:application_port]
+                  capy_config.app_host = "http://#{host}:#{port}"
+                  capy_config.run_server = false
+                end
               end
             end
           end
@@ -167,4 +169,4 @@ module Sauce
       Sauce::Capybara.configure_capybara_for_rspec
     end
   end
-end
+end

data/lib/sauce/parallel/test_broker.rb

@@ -28,7 +28,11 @@ module Sauce
           browsers[file] << test_groups[file].next_platform
         end
 
-        return {:SAUCE_PERFILE_BROWSERS => "'" + JSON.generate(browsers) + "'"}
+        on_windows = RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/
+        format_string = on_windows ? "%s" : "'%s'"
+        perfile_browsers = format_string % [JSON.generate(browsers)]
+
+        return {:SAUCE_PERFILE_BROWSERS => perfile_browsers}
       end
     end
 

data/lib/sauce/rspec.rb

@@ -62,20 +62,101 @@ rescue LoadError
   # User doesn't have RSpec 1.x installed
 rescue => e
   STDERR.puts "Exception occured: #{e.to_s}"
+  exit 1
 end
 
 begin
   require 'rspec/core'
   module Sauce
     module RSpec
+      @@server = nil
+
+      def self.server
+        return @@server
+      end
+
+      def self.server=(s)
+        @@server = s
+      end
+
+      def self.setup_environment
+        ::RSpec.configuration.before(:all, :sauce => true) do
+          Sauce::RSpec.start_tools_for_sauce_tag
+        end
+
+        ::RSpec.configuration.before :all do
+          Sauce::RSpec.start_tools_for_selenium_directory
+        end
+        ::RSpec.configuration.after :suite do
+          Sauce::RSpec.stop_tools
+        end
+      end
+
+      def self.start_tools_for_sauce_tag
+        config = Sauce::Config.new
+        if config[:start_tunnel]
+          Sauce::Utilities::Connect.start_from_config(config)
+        end
+
+        unless self.server
+          self.server= Sauce::Utilities::RailsServer.start_if_required(config)
+        end
+      end
+
+      def self.start_tools_for_selenium_directory
+        config = Sauce::Config.new
+        # TODO: Check which rspec version this changed in -- If < 2, change.
+        files_to_run = ::RSpec.configuration.respond_to?(:files_to_run) ? ::RSpec.configuration.files_to_run :
+          ::RSpec.configuration.settings[:files_to_run]
+
+        running_selenium_specs = files_to_run.any? {|file| file =~ /spec\/selenium\//}
+        need_tunnel = running_selenium_specs && config[:application_host]
+
+        if need_tunnel && config[:start_tunnel]
+          Sauce::Utilities::Connect.start_from_config(config)
+        end
+
+        if running_selenium_specs
+          unless self.server
+            self.server= Sauce::Utilities::RailsServer.start_if_required(config)
+          end
+        end
+      end
+      
+      def self.stop_tools
+        Sauce::Utilities::Connect.close
+        server.stop if self.server
+        Sauce::Utilities.warn_if_suspect_misconfiguration
+      end
+
       module SeleniumExampleGroup
         attr_reader :selenium
         alias_method :s, :selenium
 
+        def self.rspec_current_example
+          lambda { |context| ::RSpec.current_example }
+        end
+
+        def self.context_example
+          lambda { |context| context.example }
+        end
+
+        def self.find_example_method
+          ::RSpec.respond_to?(:current_example) ? rspec_current_example : context_example 
+        end
+
+        def self.current_example
+          @@current_example_fetcher ||= find_example_method
+        end
+
         # TODO V4 -- Remove this entirely
         def page
-          warn Sauce::Utilities.page_deprecation_message
-          @selenium
+          if self.class.included_modules.any? {|m| m.name == 'Capybara::DSL'}
+            ::Capybara.current_session
+          else
+            warn Sauce::Utilities.page_deprecation_message
+            @selenium
+          end
         end
 
         def self.included(othermod)
@@ -89,6 +170,7 @@ begin
                                                 :browser_version => version,
                                                 :job_name => description})
               Sauce.driver_pool[Thread.current.object_id] = @selenium
+              example = SeleniumExampleGroup.current_example.call(self)
               example.metadata[:sauce_public_link] = SauceWhisk.public_link(@selenium.session_id)
 
               begin
@@ -107,40 +189,7 @@ begin
             })
         ::RSpec.configuration.include(self, :sauce => true)
 
-        ::RSpec.configuration.before(:suite, :sauce => true) do
-          config = Sauce::Config.new
-          if config[:application_host]
-            Sauce::Utilities::Connect.start_from_config(config)
-          end
-
-          @@server = Sauce::Utilities::RailsServer.start_if_required(config)
-        end
-
-        ::RSpec.configuration.before :suite do
-          config = Sauce::Config.new
-          # TODO: Check which rspec version this changed in -- If < 2, change.
-          files_to_run = ::RSpec.configuration.respond_to?(:files_to_run) ? ::RSpec.configuration.files_to_run :
-            ::RSpec.configuration.settings[:files_to_run]
-
-          running_selenium_specs = files_to_run.any? {|file| file =~ /spec\/selenium\//}
-          need_tunnel = running_selenium_specs && config[:application_host]
-
-          if need_tunnel || config[:start_tunnel]
-            Sauce::Utilities::Connect.start_from_config(config)
-          end
-
-          if running_selenium_specs
-            @@server = Sauce::Utilities::RailsServer.start_if_required(config)
-          end
-        end
-
-        ::RSpec.configuration.after :suite do
-          Sauce::Utilities::Connect.close
-          if (defined? @@server) && @@server
-            @@server.stop
-          end
-          Sauce::Utilities.warn_if_suspect_misconfiguration
-        end
+        Sauce::RSpec.setup_environment
       end
     end
   end
@@ -148,6 +197,7 @@ rescue LoadError, TypeError
   # User doesn't have RSpec 2.x installed
 rescue => e
   STDERR.puts "Exception caught: #{e.to_s}"
+  exit 1
 end
 
 begin

data/lib/sauce/version.rb

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

data/spec/integration/rspec-capybara/spec/capybara_required_last_spec.rb

@@ -0,0 +1,18 @@
+require "spec_helper"
+
+describe "Capybara Examples where Capybara is included last", :type => :feature, :sauce => true do
+  context "When calling the #page method" do
+    it "should get access to a Capybara Session object" do
+      page.should be_a_kind_of Capybara::Session
+    end
+
+    it "should not output a deprecation message" do
+      self.should_not_receive(:warn).with(page_deprecation_warning)
+    end
+  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-capybara/spec/integration_spec.rb

@@ -0,0 +1,17 @@
+require "spec_helper"
+
+describe "Capybara examples", :js => true, :sauce => true, :type => :feature do
+  it "should not create a new driver" do
+    ::Sauce::Selenium2.should_not_receive(:new)
+    visit "http://wwww.google.com"
+  end
+
+  it "should get access to a Capybara Session object" do
+      page.should be_a_kind_of Capybara::Session
+      visit "http://www.google.com"
+  end
+
+  it "should have the same driver as stock webdriver" do
+    Capybara.current_session.driver.browser.should eq @selenium
+  end
+end

data/spec/integration/rspec-capybara/spec/sauce_config_spec.rb

@@ -0,0 +1,13 @@
+require "spec_helper"
+
+describe "Sauce::Config", :sauce => true do
+  it "should have rspec in its tool set", :sauce => true do
+    capabilities = Sauce.get_config.to_desired_capabilities
+    capabilities[:client_version].should include "Rspec"
+  end
+
+  it "should have Capybara in its tool set", :sauce => true do
+    capabilities = Sauce.get_config.to_desired_capabilities
+    capabilities[:client_version].should include "Capybara"
+  end
+end

data/spec/integration/rspec-capybara/spec/sauce_required_last_spec.rb

@@ -0,0 +1,21 @@
+require "spec_helper"
+
+describe "Capybarad Examples where Sauce is included second", :js => true do
+  include Capybara::DSL
+  include Sauce::RSpec::SeleniumExampleGroup
+  
+  context "When calling the #page method" do
+    it "should get access to a Capybara Session object" do
+      page.should be_a_kind_of Capybara::Session
+    end
+
+    it "should not output a deprecation message" do
+      self.should_not_receive(:warn).with(page_deprecation_warning)
+    end
+  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-capybara/spec/selenium/selenium_with_capybara.rb

@@ -0,0 +1,12 @@
+require "spec_helper"
+
+describe "The Selenium Directory with Capybara", :js => true do
+  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-capybara/spec/spec_helper.rb

@@ -0,0 +1,36 @@
+require "simplecov"
+
+SimpleCov.start do
+  SimpleCov.root "#{Dir.pwd}/../../../"
+  command_name 'RSpec Integration'
+  use_merging true
+  merge_timeout 6000
+end
+
+require "rspec"
+require "capybara/rspec"
+require "sauce"
+require "sauce/capybara"
+
+class MyRackApp
+  def self.call(env)
+    [200, {}, ["Hello"]]
+  end
+end
+
+Capybara.app = MyRackApp
+
+Sauce.config do |c|
+  c[:browsers] = [
+      ["Windows 2008", "iexplore", "9"]
+  ]
+
+  c[:application_host] = "localhost"
+end
+
+def page_deprecation_warning
+  return <<-MESSAGE
+[DEPRECATED] Using the #page method is deprecated for RSpec tests without Capybara.  Please use the #s or #selenium method instead.
+If you are using Capybara and are seeing this message, check the Capybara README for information on how to include the Capybara DSL in your tests.
+  MESSAGE
+end

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

@@ -8,7 +8,6 @@ SimpleCov.start do
 end
 
 require "rspec"
-require "capybara/rspec"
 require "sauce"
 
 def page_deprecation_warning

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sauce
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.4.0
 platform: ruby
 authors:
 - Dylan Lacey
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -280,9 +280,14 @@ files:
 - spec/integration/connect/spec/start_tunnel_spec.rb
 - spec/integration/connect/spec/with_capybara_spec.rb
 - spec/integration/connect_integration_spec.rb
+- spec/integration/rspec-capybara/spec/capybara_required_last_spec.rb
+- spec/integration/rspec-capybara/spec/integration_spec.rb
+- spec/integration/rspec-capybara/spec/sauce_config_spec.rb
+- spec/integration/rspec-capybara/spec/sauce_required_last_spec.rb
+- spec/integration/rspec-capybara/spec/selenium/selenium_with_capybara.rb
+- spec/integration/rspec-capybara/spec/spec_helper.rb
 - spec/integration/rspec/spec/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/integration/rspec/spec/tagging/selenium_tagging_spec.rb
 - spec/integration/testunit/test/capybara_integration_test.rb
@@ -341,9 +346,14 @@ test_files:
 - spec/integration/connect_integration_spec.rb
 - spec/integration/rspec/spec/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/integration/rspec/spec/tagging/selenium_tagging_spec.rb
+- spec/integration/rspec-capybara/spec/capybara_required_last_spec.rb
+- spec/integration/rspec-capybara/spec/integration_spec.rb
+- spec/integration/rspec-capybara/spec/sauce_config_spec.rb
+- spec/integration/rspec-capybara/spec/sauce_required_last_spec.rb
+- spec/integration/rspec-capybara/spec/selenium/selenium_with_capybara.rb
+- spec/integration/rspec-capybara/spec/spec_helper.rb
 - spec/integration/testunit/test/capybara_integration_test.rb
 - spec/integration/testunit/test/integration_test.rb
 - spec/integration/testunit/test/test_helper.rb

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

@@ -1,36 +0,0 @@
-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