RubyGems - sauce - Versions diffs - 3.2.0 → 3.3.0 - Mend

sauce 3.2.0 → 3.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

checksums.yaml +8 -8
data/lib/sauce/capybara.rb +18 -2
data/lib/sauce/config.rb +11 -5
data/lib/sauce/rspec.rb +1 -1
data/lib/sauce/version.rb +1 -1
data/lib/tasks/parallel_testing.rb +51 -55
data/spec/sauce/config/perfile_browser_spec.rb +105 -0
data/spec/sauce/jasmine_spec.rb +7 -26
data/spec/sauce/tasks_spec.rb +180 -0
metadata +8 -4

checksums.yaml CHANGED Viewed

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjhiN2EwMGM0NjAwOTg1NTBlMzI2NWRkNWJlZWE1YTYzYTU0YzY4ZA==
+    NWYwMzk0OTAwOWExN2U1ZTVlYjY1ODA3ZmU5ZTZiNTQ5N2Q2ZDdkZQ==
   data.tar.gz: !binary |-
-    YTkxN2RmNGM0NzZjMTAzYmQ4MGM3OTYwMzg5NmIxODM0ODgxMzNkZg==
+    NmNiOTFiNmRlNDhlOTg5ZmVjM2ZkN2Q1YzZkZWIyZWQwZjFjZjkyZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Y2E3NWQ2ODQ0NGI5NGEzZjUxYWI4ODQyNTM5NDI1MTgwZWQ4MjQ0ZmNhMmFm
-    OTdlNThlNDcxNzRlMzFkMTVjNjFiMDRkZjc5YjU4YWM2YzIwYjE5Yzk2NTkw
-    ZThjMzM1MjEyOTQ4MmViN2I5YTgwZjRjZGFmYTQyZDVkZDZhNzA=
+    YzY5ODc2OTg0ZGZmYTYzZDI4Y2EwMDlmYTQzMjUxMmM2MTY2ODQ5MDU0MTk4
+    ZjliNDZlNGQ1YWFjZTIzZGU3YTU4NTNlN2E1Y2ZjMDBiYWE5MWU5MGYzMjQ3
+    YjNhZGE2Yzk5NDExYjkzMmNlY2I1ZWM0NWRhM2Q2ZjU4NWJmMTg=
   data.tar.gz: !binary |-
-    N2UzOWU3OGNkYmJmZGI0YzQ4ZTFjYTA5YjgxMjBiMjRkYzJkYzUyOTdkNjVj
-    M2ZlYWYwZmNhZTIwZDRiYWM0NjkzNGNiOTg4YjMzOTE4MzM4OTJmYzQ1YzJj
-    NGU1NjYzNjVkZTFmZGUwMDNmZjhjZTY2M2VlYmU5NjkxNzkwMTY=
+    ODVkZjc0NzQ2ZDk0NzViNWZhODQ5ZmYwM2E3MjMxMjQ1MGI2YmVlNmJlMDlh
+    OGIzZjM3MWVlNjAxZWM2YWQ4OTdjOGFjMjhlMzJkZWQzODA0MWJjOTdkOTg1
+    OWE0NjU2MzgwOTYyMjFmYTMwMmE0NGNlODllZWNjMDYzZGU5YTQ=

data/lib/sauce/capybara.rb CHANGED Viewed

@@ -38,14 +38,13 @@ module Sauce
       alias :base_visit :visit
       alias :base_current_url :current_url
-      alias :base_reset! :reset!
       alias :base_within_frame :within_frame
       alias :base_within_window :within_window
       alias :base_find_window :find_window
       alias :base_execute_script :execute_script
       alias :base_evaluate_script :evaluate_script
-      @methods_to_retry = [:visit, :current_url, :reset!,
+      @methods_to_retry = [:visit, :current_url,
         :within_frame, :within_window, :find_window, :source,
         :execute_script, :evaluate_script
       ]
@@ -114,6 +113,23 @@ module Sauce
       def render(path)
         browser.save_screenshot path
       end
+      # Overridden to deal with Capybara calling empty html file.
+      # Stolen from (And can be removed when superceeded by the merge of)
+      # https://github.com/jnicklas/capybara/pull/1215
+      def reset!
+        empty_html = "data:text/html,<html></html>"
+        # Use instance variable directly so we avoid starting the browser just to reset the session
+        if @browser
+          begin @browser.manage.delete_all_cookies
+          rescue Selenium::WebDriver::Error::UnhandledError
+          # delete_all_cookies fails when we've previously gone
+          # to about:blank, so we rescue this error and do nothing
+          # instead.
+          end
+          @browser.navigate.to(empty_html)
+        end
+      end
     end
   end
 end

data/lib/sauce/config.rb CHANGED Viewed

@@ -181,13 +181,19 @@ module Sauce
       return [[os, browser, browser_version]]
     end
-    def browsers_for_file(file)
+    def browsers_for_location(file, linenumber=nil)
       Sauce::Config.called_from_integrations
-      if @opts[:perfile_browsers]
-        @opts[:perfile_browsers][file].map do |h|
-          [h['os'], h['browser'], h['version']]
+      perfile_browsers = @opts[:perfile_browsers]
+      if perfile_browsers
+        platforms = []
+        test_location = "#{file}:#{linenumber}"
+        if linenumber && (perfile_browsers.include? test_location)
+          platforms =  perfile_browsers[test_location]
+        else
+          platforms = perfile_browsers[file]
         end
+        platforms.map { |p| [p['os'], p['browser'], p['version']] }
       else
         browsers
       end

data/lib/sauce/rspec.rb CHANGED Viewed

@@ -78,7 +78,7 @@ begin
             config = Sauce::Config.new
             description = the_test.metadata[:full_description]
             file = the_test.metadata[:file_path]
-            config.browsers_for_file(file).each do |os, browser, version|
+            config.browsers_for_location(file).each do |os, browser, version|
               @selenium = Sauce::Selenium2.new({:os => os,
                                                 :browser => browser,
                                                 :browser_version => version,

data/lib/sauce/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module Sauce
-  MAJOR_VERSION = '3.2'
+  MAJOR_VERSION = '3.3'
   PATCH_VERSION = '0'
   def version

data/lib/tasks/parallel_testing.rb CHANGED Viewed

@@ -3,66 +3,16 @@ require "parallel_tests"
 require "parallel_tests/tasks"
 require "parallel_tests/cli_patch"
 namespace :sauce do
-  task :spec, :spec_files, :concurrency, :rspec_options do |t, args|
+  task :spec, :spec_files, :concurrency, :test_options, :parallel_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({
-      :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", "#{concurrency}"
-    ]
-    unless rspec_options.nil?
-      parallel_arguments.push "-o"
-      parallel_arguments.push rspec_options
-    end
-    parallel_arguments.push spec_files
+    parallel_arguments = parse_task_args(:rspec, args)
     ParallelTests::CLI.new.run(parallel_arguments)
   end
-  task :features, :files, :concurrency  do |t, args|
-    args.with_defaults({
-      :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", concurrency.to_s,
-      features
-    ]
-    STDERR.puts "ARGS #{parallel_arguments}"
+  task :features, :files, :concurrency, :test_options, :parallel_options do |t, args|
+    parallel_arguments = parse_task_args(:cucumber, args)
     ParallelTests::CLI.new.run(parallel_arguments)
   end
@@ -115,3 +65,49 @@ namespace :sauce do
     end
   end
 end
+def parse_task_args(test_tool=:rspec, args)
+  default = {
+    :concurrency => [Sauce::TestBroker.concurrency, 20].min
+  }
+  if test_tool == :rspec
+    default[:test_options] = '-t sauce'
+    default[:files] = 'spec'
+  end
+  if test_tool == :cucumber
+    default[:files] = 'features'
+  end
+  env_args = {
+    :concurrency => ENV['concurrency'],
+    :features => ENV['features'],
+    :parallel_options => ENV['parallel_test_options'],
+    :test_options => ENV['test_options'],
+    :files => ENV['test_files']
+  }
+  concurrency = args[:concurrency] || env_args[:concurrency] || default[:concurrency]
+  test_options = args[:test_options] || env_args[:test_options] || default[:test_options]
+  parallel_options = args[:parallel_options] || env_args[:parallel_options]
+  files = args[:files] || env_args[:files] || default[:files]
+  return_args = [
+    '-n', concurrency.to_s,
+    '--type'
+  ]
+  return_args.push 'saucerspec' if test_tool == :rspec
+  return_args.push 'saucecucumber' if test_tool == :cucumber
+  if test_options
+    return_args.push '-o'
+    return_args.push test_options
+  end
+  return_args.push *(parallel_options.split(' ')) if parallel_options
+  return_args.push files
+  return return_args
+end

data/spec/sauce/config/perfile_browser_spec.rb ADDED Viewed

@@ -0,0 +1,105 @@
+require "spec_helper"
+describe "Sauce::Config" do
+  describe "#perfile_browsers" do
+    before :each do
+      ENV['SAUCE_PERFILE_BROWSERS'] = nil
+    end
+    after :each do
+      ENV['SAUCE_PERFILE_BROWSERS'] = nil
+    end
+    it "returns browsers when perfile_browsers is blank" do
+      expected_browsers = [
+        ["Linux", "Chrome", "nil"]
+      ]
+      Sauce.config do |c|
+        c[:browsers] = expected_browsers
+      end
+      config = Sauce::Config.new
+      filename = "./features/duckduck.feature"
+      fn = 14
+      Sauce::Config.new.browsers_for_location(filename, fn).should eq expected_browsers
+    end
+    it "should return the browsers for the requested location" do
+      expected_browsers = [
+        ["Linux", "Chrome", "nil"],
+        ["Mac", "Safari", "5"]
+      ]
+      browser_hash = expected_browsers.map { |a|
+       {"os" => a[0], "browser" => a[1], "version" => a[2]}
+      }
+      env_hash = {
+        "./features/duckduck.feature:14"=> browser_hash,
+        "./features/adifferent.feature"=>[
+          {"os"=>"Windows 7", "browser"=>"Firefox", "version"=>"19"}
+        ]
+      }
+      ENV['SAUCE_PERFILE_BROWSERS'] = env_hash.to_json
+      filename = "./features/duckduck.feature"
+      fn = 14
+      Sauce::Config.new.browsers_for_location(filename, fn).should eq expected_browsers
+    end
+    it "returns the line number location if present" do
+      expected_browsers = [
+        ["Linux", "Chrome", "nil"],
+        ["Mac", "Safari", "5"]
+      ]
+      browser_hash = expected_browsers.map { |a|
+       {"os" => a[0], "browser" => a[1], "version" => a[2]}
+      }
+      env_hash = {
+        "./features/duckduck.feature"=>[
+          {"os"=>"Windows 7", "browser"=>"Firefox", "version"=>"19"}
+        ],
+        "./features/duckduck.feature:11"=> browser_hash
+      }
+      ENV['SAUCE_PERFILE_BROWSERS'] = env_hash.to_json
+      filename = "./features/duckduck.feature"
+      fn = 11
+      Sauce::Config.new.browsers_for_location(filename, fn).should eq expected_browsers
+    end
+        it "ignores line number if it can't find it" do
+      expected_browsers = [
+        ["Linux", "Chrome", "nil"],
+        ["Mac", "Safari", "5"]
+      ]
+      browser_hash = expected_browsers.map { |a|
+       {"os" => a[0], "browser" => a[1], "version" => a[2]}
+      }
+      env_hash = {
+        "./features/duckduck.feature:11"=>[
+          {"os"=>"Windows 7", "browser"=>"Firefox", "version"=>"19"}
+        ],
+        "./features/duckduck.feature"=> browser_hash
+      }
+      ENV['SAUCE_PERFILE_BROWSERS'] = env_hash.to_json
+      filename = "./features/duckduck.feature"
+      fn = 6
+      Sauce::Config.new.browsers_for_location(filename, fn).should eq expected_browsers
+    end
+  end
+end

data/spec/sauce/jasmine_spec.rb CHANGED Viewed

@@ -1,49 +1,30 @@
 require 'spec_helper'
 require 'sauce/jasmine'
-describe Sauce::Jasmine::Driver do
+describe Jasmine::SeleniumDriver do
   describe '#initialize' do
     let(:address) { 'http://saucelabs.com' }
     let(:browser) { 'firefox' }
     it 'should take set the @http_address' do
       Sauce::Selenium2.stub(:new)
-      d = Sauce::Jasmine::Driver.new(browser, address)
+      d = Jasmine::SeleniumDriver.new(browser, address)
       d.http_address.should equal(address)
     end
     it 'should initialize a Sauce driver' do
       Sauce::Selenium2.should_receive(:new).with(anything).and_return(true)
-      d = Sauce::Jasmine::Driver.new(browser, address)
+      d = Jasmine::SeleniumDriver.new(browser, address)
       d.should_not be_nil
     end
   end
 end
-describe Jasmine::Config do
-  describe '#start' do
-    before :each do
-      # Stub out the creation of the Selenium2 driver itself
-      Sauce::Selenium2.stub(:new)
-      Sauce::Jasmine::Driver.stub(:new).and_return(driver)
-    end
-    let(:driver) do
-      driver = double('Sauce::Jasmine::Driver')
-      driver.stub(:connect)
-      driver
-    end
-    it 'should create a Sauce::Jasmine::Driver' do
-      Sauce::Jasmine::Driver.should_receive(:new).and_return(driver)
-      subject.start
-      subject.instance_variable_get(:@client).should be driver
-    end
-    it 'should call connect on the driver' do
-      driver.should_receive(:connect)
-      subject.start
+describe Jasmine::Configuration do
+  describe '#port' do
+    it 'returns 3001' do
+      expect(Jasmine::Configuration.new.port).to eq(3001)
     end
   end
 end

data/spec/sauce/tasks_spec.rb ADDED Viewed

@@ -0,0 +1,180 @@
+require 'spec_helper'
+describe 'parse_task_args' do
+  before :each do
+    Sauce::TestBroker.stub(:concurrency) {20}
+  end
+  it 'returns the saucerspec type when using rspec' do
+    actual_args = parse_task_args(:rspec, {}).join ' '
+    actual_args.should include '--type saucerspec'
+  end
+  it 'returns the saucecucumber type when using cucumber' do
+    actual_args = parse_task_args(:cucumber, {}).join ' '
+    actual_args.should include '--type saucecucumber'
+  end
+  context 'files' do
+    it 'is parsed from the :files argument' do
+      task_args = {:files => 'proscuitto/iberico.spec'}
+      actual_args = parse_task_args(task_args).join ' '
+      actual_args.end_with?('proscuitto/iberico.spec').should be_true
+    end
+    it 'defaults to spec when rspec is used' do
+      actual_args = parse_task_args(:rspec, {}).join ' '
+      actual_args.end_with?('spec').should be_true
+    end
+    it 'defaults to features when cucumber is used' do
+      actual_args = parse_task_args(:cucumber, {}).join ' '
+      actual_args.end_with?('features').should be_true
+    end
+    context 'when set by environment variable' do
+      before :each do
+        @stored_test_files = ENV['test_files']
+        ENV['test_files'] = nil
+      end
+      after :each do
+        ENV['test_files'] = @stored_test_files
+      end
+      it 'comes from the test_files variable' do
+        ENV['test_files'] = 'pancetta'
+        actual_args = parse_task_args(:rspec, {}).join ' '
+        actual_args.end_with?('pancetta').should be_true
+      end
+      it 'is overridden by the CLI' do
+        ENV['test_files'] = 'spam'
+        test_args = {:files => 'bacon'}
+        actual_args = parse_task_args(:rspec, test_args).join ' '
+        actual_args.end_with?('bacon').should be_true
+        actual_args.should_not include 'spam'
+      end
+    end
+  end
+  context 'concurrency' do
+    it 'parses the second argument' do
+      task_args = {:features => 'features', :concurrency => '4'}
+      actual_args = parse_task_args(task_args).join ' '
+      actual_args.should include '-n 4'
+    end
+    context 'when set by environment variable' do
+      before :each do
+        @stored_concurrency = ENV['concurrency']
+        ENV['concurrency'] = nil
+      end
+      after :each do
+        ENV['concurrency'] = @stored_concurrency
+      end
+      it 'is parsed out' do
+        ENV['concurrency'] = '18'
+        actual_args = parse_task_args({}).join ' '
+        actual_args.should include '-n 18'
+      end
+      it 'is overridden by the CLI' do
+        ENV['concurrency'] = '14'
+        task_args = {:files => 'features', :concurrency => '12'}
+        actual_args = parse_task_args(task_args).join ' '
+        actual_args.should include '-n 12'
+      end
+    end
+    context 'test options' do
+      it 'are parsed from the test_options argument' do
+        task_args = {:test_options => '--no-derp'}
+        actual_args = parse_task_args(task_args).join ' '
+        actual_args.should include '-o --no-derp'
+      end
+      context 'when not supplied' do
+        it 'default to -t sauce for rspec' do
+          actual_args = parse_task_args(:rspec, {}).join ' '
+          actual_args.should include '-o -t sauce'
+        end
+        it 'defaults to not being present for cucumber' do
+          actual_args = parse_task_args(:cucmber, {}).join ' '
+          actual_args.should_not include '-o'
+        end
+      end
+      context 'when set from environment options' do
+        before :each do
+          @stored_rspec_options = ENV['test_options']
+          ENV['test_options'] = nil
+        end
+        after :each do
+          ENV['test_options'] = @stored_rspec_options
+        end
+        it 'is read from the test_options variable' do
+          ENV['test_options'] = '-derp_level some'
+          actual_args = parse_task_args({}).join ' '
+          actual_args.should include '-o -derp_level some'
+        end
+        it 'is overridden by the CLI' do
+          ENV['test_options'] = '-derp_level maximum'
+          task_args = {:test_options => '--no-derp'}
+          actual_args = parse_task_args(task_args).join ' '
+          actual_args.should_not include '-derp_level maximum'
+          actual_args.should include '-o --no-derp'
+        end
+      end
+    end
+    context "parallel tests options" do
+      it 'is parsed from the parallel_options argument' do
+        test_args = {:parallel_options => 'wow'}
+        actual_args = parse_task_args(test_args).join ' '
+        actual_args.should include 'wow'
+      end
+      it 'is broken into individual options' do
+        test_args = {:parallel_options => '--scared so'}
+        actual_args = parse_task_args(:rspec, test_args)
+        actual_args.should include '--scared'
+        actual_args.should include 'so'
+        index = actual_args.index '--scared'
+        actual_args[index + 1].should eq 'so'
+      end
+      context 'read from environment variables' do
+        before :each do
+          @@stored_rspec_options = ENV['rspec_options']
+          ENV['parallel_test_options'] = nil
+        end
+        after :each do
+          ENV['parallel_test_options'] = @@stored_rspec_options
+        end
+        it 'is read from the parallel_test_options variable' do
+          ENV['parallel_test_options'] = '-such option'
+          actual_args = parse_task_args({}).join ' '
+          actual_args.should include '-such option'
+        end
+        it 'is overridden by the CLI' do
+          ENV['parallel_test_options'] = '-such option'
+          task_args = {:parallel_options => 'many override'}
+          actual_args = parse_task_args(task_args).join ' '
+          actual_args.should_not include '-such option'
+          actual_args.should include 'many override'
+        end
+      end
+    end
+  end
+end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sauce
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Dylan Lacey
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -189,14 +189,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.5
 - !ruby/object:Gem::Dependency
   name: sauce_whisk
   requirement: !ruby/object:Gem::Requirement
@@ -262,12 +262,14 @@ files:
 - spec/sauce/config/default_browsers_spec.rb
 - spec/sauce/config/environment_config_spec.rb
 - spec/sauce/config/load_defaults_spec.rb
+- spec/sauce/config/perfile_browser_spec.rb
 - spec/sauce/cucumber_spec.rb
 - spec/sauce/driver_pool_spec.rb
 - spec/sauce/file_detector_spec.rb
 - spec/sauce/jasmine_spec.rb
 - spec/sauce/parallel/test_broker_spec.rb
 - spec/sauce/selenium_spec.rb
+- spec/sauce/tasks_spec.rb
 - spec/sauce/utilities/rails_server_spec.rb
 - spec/sauce/utilities/rake_spec.rb
 - spec/sauce/utilities/utilities_spec.rb
@@ -316,12 +318,14 @@ test_files:
 - spec/sauce/config/default_browsers_spec.rb
 - spec/sauce/config/environment_config_spec.rb
 - spec/sauce/config/load_defaults_spec.rb
+- spec/sauce/config/perfile_browser_spec.rb
 - spec/sauce/cucumber_spec.rb
 - spec/sauce/driver_pool_spec.rb
 - spec/sauce/file_detector_spec.rb
 - spec/sauce/jasmine_spec.rb
 - spec/sauce/parallel/test_broker_spec.rb
 - spec/sauce/selenium_spec.rb
+- spec/sauce/tasks_spec.rb
 - spec/sauce/utilities/rails_server_spec.rb
 - spec/sauce/utilities/rake_spec.rb
 - spec/sauce/utilities/utilities_spec.rb