sauce 3.1.3 → 3.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2JjYzUwNDFiY2E4NDk2ZWY3ODY2MjliMzE4YzUyMDlmYzA0Yzc1ZQ==
+    MjhiN2EwMGM0NjAwOTg1NTBlMzI2NWRkNWJlZWE1YTYzYTU0YzY4ZA==
   data.tar.gz: !binary |-
-    N2Q2OTJlZTM3ODIzMjU2ZTM3ZGIzOWNiYmU5NTVlYWI0NDI0NTg0ZQ==
+    YTkxN2RmNGM0NzZjMTAzYmQ4MGM3OTYwMzg5NmIxODM0ODgxMzNkZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGMyODQ0YWZmZmE5NDA2Nzk2Y2QwY2MwZWFmZDM5MWE5NDNkMjY3MDhkMTNk
-    YjAwZGExMDRkZWE0NTBkZjFlNTkwZDRhNTk3ZTgwNTEzMzBiNzUyZGU0MjE3
-    NzIzMDkwNjgxZGRlZGUxY2ViM2FiMTM5NDA4OTU0OTZkOGI0ZWE=
+    Y2E3NWQ2ODQ0NGI5NGEzZjUxYWI4ODQyNTM5NDI1MTgwZWQ4MjQ0ZmNhMmFm
+    OTdlNThlNDcxNzRlMzFkMTVjNjFiMDRkZjc5YjU4YWM2YzIwYjE5Yzk2NTkw
+    ZThjMzM1MjEyOTQ4MmViN2I5YTgwZjRjZGFmYTQyZDVkZDZhNzA=
   data.tar.gz: !binary |-
-    Zjg5Mjk4Zjg4YjhkYjVjOTU1ZTE3MWU1NjM5MWNhY2I2ZDRkOWQxMWEyYWIw
-    Nzc1NTkyZTkwNWEyOTkwZGQxM2VhM2MxZTBhMGNjNjRiMmIzZmUwOGU5ZDhi
-    Y2JjYjZmZDBmZGIyNWY3NzkyZDMxN2EwNGQzOTg5YWQxZTE3YmQ=
+    N2UzOWU3OGNkYmJmZGI0YzQ4ZTFjYTA5YjgxMjBiMjRkYzJkYzUyOTdkNjVj
+    M2ZlYWYwZmNhZTIwZDRiYWM0NjkzNGNiOTg4YjMzOTE4MzM4OTJmYzQ1YzJj
+    NGU1NjYzNjVkZTFmZGUwMDNmZjhjZTY2M2VlYmU5NjkxNzkwMTY=

data/lib/sauce.rb

@@ -23,4 +23,4 @@ if RUBY_VERSION == "1.9.3" && RUBY_PATCHLEVEL < 392
       end
     end
   end
-end
+end

data/lib/sauce/config.rb

@@ -27,7 +27,8 @@ module Sauce
         :local_application_port => "3001",
         :capture_traffic => false,
         :start_tunnel => true,
-        :start_local_application => true
+        :start_local_application => true,
+        :warn_on_skipped_integration => true
     }
 
     DEFAULT_BROWSERS = {
@@ -73,6 +74,14 @@ module Sauce
       return POTENTIAL_PORTS[port_index]
     end
 
+    def self.called_from_integrations?
+      @called_from_integrations || false
+    end
+
+    def self.called_from_integrations
+      @called_from_integrations = true
+    end
+
     def initialize(opts={})
       @opts = {}
       @undefaulted_opts = {}
@@ -173,6 +182,8 @@ module Sauce
     end
 
     def browsers_for_file(file)
+      Sauce::Config.called_from_integrations
+
       if @opts[:perfile_browsers]
         @opts[:perfile_browsers][file].map do |h|
           [h['os'], h['browser'], h['version']]

data/lib/sauce/parallel/test_broker.rb

@@ -60,7 +60,7 @@ module Sauce
       @@platforms
     end
 
-    def self.concurrencies
+    def self.concurrency
       response = RestClient.get "#{rest_jobs_url}/#{SAUCE_USERNAME}/limits"
       res = JSON.parse(response)["concurrency"]
     end

data/lib/sauce/rspec.rb

@@ -102,42 +102,38 @@ 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(:host => config[:application_host], :port => config[:application_port], :quiet => true)
+            Sauce::Utilities::Connect.start_from_config(config)
           end
 
-          if config[:start_local_application] &&
-            Sauce::Utilities::RailsServer.is_rails_app?
-              @@server = Sauce::Utilities::RailsServer.new
-              @@server.start
-          end
+          @@server = Sauce::Utilities::RailsServer.start_if_required(config)
         end
 
         ::RSpec.configuration.before :suite do
-          need_tunnel = false
           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]
-          if config[:application_host]
-            need_tunnel = files_to_run.any? {|file| file =~ /spec\/selenium\//}
-          end
+
+          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(:host => config[:application_host], :port => config[:application_port], :quiet => true)
+            Sauce::Utilities::Connect.start_from_config(config)
           end
 
-          if config[:start_local_application] &&
-            files_to_run.any? {|file| file =~ /spec\/selenium\//} &&
-            Sauce::Utilities::RailsServer.is_rails_app?
-              @@server = Sauce::Utilities::RailsServer.new
-              @@server.start
+          if running_selenium_specs
+            @@server = Sauce::Utilities::RailsServer.start_if_required(config)
           end
         end
+
         ::RSpec.configuration.after :suite do
           Sauce::Utilities::Connect.close
-          @@server.stop if defined? @@server
+          if (defined? @@server) && @@server
+            @@server.stop 
+          end
+          Sauce::Utilities.warn_if_suspect_misconfiguration
         end
       end
     end

data/lib/sauce/selenium.rb

@@ -26,6 +26,14 @@ module Sauce
   class Selenium2
     attr_reader :config, :driver
 
+    def self.used_at_least_once?
+      @used_at_least_once || false
+    end
+
+    def self.used_at_least_once
+      @used_at_least_once = true
+    end
+
     def initialize(opts={})
       @config = Sauce::Config.new(opts)
       http_client = ::Selenium::WebDriver::Remote::Http::Persistent.new
@@ -40,6 +48,8 @@ module Sauce
         file_path = args.first.to_s
         File.exist?(file_path) ? file_path : false
       end
+
+      Sauce::Selenium2.used_at_least_once
     end
 
     def method_missing(meth, *args)

data/lib/sauce/utilities.rb

@@ -32,11 +32,49 @@ module Sauce
       end
     end
 
+    def self.warn_if_suspect_misconfiguration(style = :rspec)
+      if Sauce::Selenium2.used_at_least_once?
+        integrated = Sauce::Config.called_from_integrations?
+        warnings_on = Sauce::Config.new[:warn_on_skipped_integration]
+        unless (integrated && warnings_on)
+          STDERR.puts Sauce::Utilities.incorrectly_integrated_warning(style)
+        end
+      end
+    end
+
     def self.page_deprecation_message
       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
+
+    def self.incorrectly_integrated_warning(style = :rspec)
+      case style
+        when :cuke
+          tests = 'features'
+          runner = 'Cucumber'
+          tag = '@selenium'
+        else :rspec
+          tests = 'specs'
+          runner = 'RSpec'
+          tag = ':sauce => true'
+      end
+
+      return <<-stringend
+
+===============================================================================
+Your #{tests} used the Sauce Selenium driver, but not the #{runner} integration.
+This may result in undesired behaviour, such as configured platforms being
+skipped.
+
+You can correct this by tagging #{tests} intended for Sauce with
+'#{tag}'.
+
+You can disable this message by setting the 'warn_on_skipped_integration'
+config option to false.
+===============================================================================
+      stringend
+    end
   end
 end

data/lib/sauce/utilities/connect.rb

@@ -1,6 +1,10 @@
 module Sauce
   module Utilities
     class Connect
+      def self.start_from_config(config)
+        self.start(:host => config[:application_host], :port => config[:application_port], :quiet => true)
+      end
+
       def self.start(options={})
         begin
           require "sauce/connect"

data/lib/sauce/utilities/rails_server.rb

@@ -6,6 +6,17 @@ module Sauce
     class RailsServer
       include Sauce::Utilities
 
+      def self.start_if_required(config)
+        if config[:start_local_application] && self.is_rails_app?
+          server = new
+          server.start
+
+          return server
+        end
+
+        return server
+      end
+
       def self.is_rails_app?
         return !major_version.nil?
       end

data/lib/sauce/version.rb

@@ -1,6 +1,6 @@
 module Sauce
-  MAJOR_VERSION = '3.1'
-  PATCH_VERSION = '3'
+  MAJOR_VERSION = '3.2'
+  PATCH_VERSION = '0'
 
   def version
     "#{MAJOR_VERSION}.#{PATCH_VERSION}"

data/lib/tasks/parallel_testing.rb

@@ -4,41 +4,65 @@ require "parallel_tests/tasks"
 require "parallel_tests/cli_patch"
 
 namespace :sauce do
-  task :spec, :files, :concurrencies, :rspec_opts do |t, args|
+  task :spec, :spec_files, :concurrency, :rspec_options do |t, args|
     ::RSpec::Core::Runner.disable_autorun!
 
+    env_args = {
+      :concurrency => ENV['concurrency'],
+      :rspec_options => ENV['rspec_options'],
+      :spec_files => ENV['specs']
+    }
+
+    env_args.delete_if {|k,v| k.nil? || k == ''}
+
     args.with_defaults({
-      :concurrencies => [Sauce::TestBroker.concurrencies, 20].min,
+      :concurrency => [Sauce::TestBroker.concurrency, 20].min,
       :files => "spec",
       :rspec_opts => "-t sauce"
     })
 
+    concurrency = env_args[:concurrency]    || args[:concurrency]
+    spec_files = env_args[:spec_files]        || args[:files]
+    rspec_options = env_args[:rspec_options]  || args[:rspec_options]
+
     parallel_arguments = [
       "--type", "saucerspec",
-      "-n", "#{args[:concurrencies]}"
+      "-n", "#{concurrency}"
     ]
 
-    unless args[:rspec_opts].nil?
+    unless rspec_options.nil?
       parallel_arguments.push "-o"
-      parallel_arguments.push args[:rspec_opts]
+      parallel_arguments.push rspec_options
     end
 
-    parallel_arguments.push args[:files]
+    parallel_arguments.push spec_files
+
     ParallelTests::CLI.new.run(parallel_arguments)
   end
 
-  task :features, :files, :concurrencies  do |t, args|
+  task :features, :files, :concurrency  do |t, args|
     args.with_defaults({
-      :concurrency => [Sauce::TestBroker.concurrencies, 20].min,
+      :concurrency => [Sauce::TestBroker.concurrency, 20].min,
       :files => "features"
     })
 
+    env_args = {
+      :concurrency => ENV['concurrency'],
+      :features => ENV['features']
+    }
+
+    env_args.delete_if {|k,v| k.nil? || k == ''}
+
+    concurrency = env_args[:concurrency] || args[:concurrency]
+    features = env_args[:features] || args[:files]
+
     parallel_arguments = [
       "--type", "saucecucumber",
-      "-n", args[:concurrencies].to_s,
-      args[:files]
+      "-n", concurrency.to_s,
+      features
     ]
 
+    STDERR.puts "ARGS #{parallel_arguments}"
     ParallelTests::CLI.new.run(parallel_arguments)
   end
 

data/spec/sauce/cucumber_spec.rb

@@ -69,7 +69,7 @@ module Sauce::Capybara
       before :each do
         # Need to create our nice mocked Capybara driver
         Capybara.stub_chain(:current_session, :driver).and_return(driver)
-        Sauce::Job.stub(:new).and_return(nil)
+        SauceWhisk::Job.stub(:new).and_return(nil)
         Sauce::Selenium2.stub(:new).with(anything).and_return Object.new
       end
 

data/spec/sauce/utilities/rails_server_spec.rb

@@ -3,6 +3,20 @@ require "spec_helper"
 describe "Sauce::Utilities::RailsServer" do
   let (:server) {Sauce::Utilities::RailsServer.new}
 
+  describe "##start_if_required" do
+    context "With an :application_host in config" do
+      it "starts" do
+        config = {:start_local_application => true}
+        fake_rails_server = double("Sauce::Utilities::RailsServer")
+        expect(fake_rails_server).to receive(:start) {nil}
+        expect(Sauce::Utilities::RailsServer).to receive(:new) {fake_rails_server}
+        allow(Sauce::Utilities::RailsServer).to receive(:is_rails_app?) {true}
+
+        Sauce::Utilities::RailsServer.start_if_required(config)
+      end
+    end
+  end
+
   context "With a Rails 4 app" do
     before (:each) do
       File.stub(:exists?).and_return false

data/spec/sauce/utilities/utilities_spec.rb

@@ -14,6 +14,7 @@ describe "Sauce::Utilities::Connect" do
   after :each do
     Sauce::Utilities::Connect.instance_variable_set(:@tunnel, nil)
   end
+
   describe "##start" do
     it "should call Sauce Connect when included" do
       @mock_tunnel.stub(:connect).and_return true
@@ -83,4 +84,54 @@ describe "Sauce::Utilities::Connect" do
       Sauce::Utilities::Connect.close
     end
   end
+
+  describe "##warn_if_suspect_misconfiguration" do
+    it "does not fire if no Selenium sessions have been fired" do
+
+    end
+  end
+
+  describe "##incorrectly_integrated_warning" do
+    it "should return rspec warning by default" do
+      Sauce::Utilities.incorrectly_integrated_warning.should eq rspec_warning
+    end
+
+    it "should allow for the cucumber warning to be selected" do
+      Sauce::Utilities.incorrectly_integrated_warning(:cuke).should eq cuke_warning
+    end
+  end
 end
+
+def rspec_warning
+  return <<-stringend
+
+===============================================================================
+Your specs used the Sauce Selenium driver, but not the RSpec integration.
+This may result in undesired behaviour, such as configured platforms being
+skipped.
+
+You can correct this by tagging specs intended for Sauce with
+':sauce => true'.
+
+You can disable this message by setting the 'warn_on_skipped_integration'
+config option to false.
+===============================================================================
+  stringend
+end
+
+def cuke_warning
+  return <<-stringend
+
+===============================================================================
+Your features used the Sauce Selenium driver, but not the Cucumber integration.
+This may result in undesired behaviour, such as configured platforms being
+skipped.
+
+You can correct this by tagging features intended for Sauce with
+'@selenium'.
+
+You can disable this message by setting the 'warn_on_skipped_integration'
+config option to false.
+===============================================================================
+  stringend
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sauce
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.2.0
 platform: ruby
 authors:
 - Dylan Lacey
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara