sauce 2.1.0 → 2.2.0

data/Gemfile

@@ -6,11 +6,11 @@ gemspec
 
 group :test do
   gem 'cucumber'
-  gem 'rspec', '~> 2.9'
+  gem 'rspec', '~> 2.12'
   gem 'capybara'
   gem 'jasmine'
 end
 
 group :development do
-  gem 'ruby-debug'
+  gem 'debugger'
 end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2010 Sauce Labs Inc
+Copyright (c) 2009-2012 Sauce Labs Inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.markdown

@@ -1,11 +1,16 @@
-# Sauce OnDemand for Ruby
+# Sauce for Ruby
 
 [![Build Status](https://buildhive.cloudbees.com/job/saucelabs/job/sauce_ruby/badge/icon)](https://buildhive.cloudbees.com/job/saucelabs/job/sauce_ruby/)
 
-Sauce OnDemand is a Selenium-based browser testing service offered by [Sauce
+Sauce is a Selenium-based browser testing service offered by [Sauce
 Labs](https://www.saucelabs.com).
 
 
+There is more information on **[the
+wiki](https://github.com/saucelabs/sauce_ruby/wiki)**, so be sure to look there
+for information too!
+
+
 ## Installation
 
 ```bash
@@ -20,71 +25,43 @@ The Sauce gem has been optimized to work most effectively with
 [Cucumber](https://www.cukes.info) and
 [Capybara](http://jnicklas.github.com/capybara/).
 
-You can read more about how to get started with [Cucumber and Capybara on this
-wiki
-page](https://github.com/saucelabs/sauce\_ruby/wiki/Cucumber-and-Capybara).
-
-
-
-## Legacy Rails Integration
-
-You can use either RSpec or Test::Unit with Rails and Sauce OnDemand.  To get started, run the generator:
-
-`script/generate sauce USERNAME ACCESS_KEY`
-
-The generator will take care of setting up your helpers with Sauce OnDemand
-configuration, which you can tweak inside the `Sauce.config` block if necessary.
-
-### Example RSpec test for Rails
-
-Here's an example test for RSpec.  Drop something like this in spec/selenium/example.rb.  (Because of the way RSpec categorizes tests, the "spec/selenium" directory tree is required for the integration to work properly):
+To get started with Sauce and Cucumber, install the appropriate gem:
 
-    require "spec_helper"
-
-    describe "my app" do
-      it "should have a home page" do
-        s.get 'http://localhost:3001/'
-        assert s.page_source.include? 'Welcome aboard'
-      end
-    end
-
-Here's how you run RSpec tests with Sauce OnDemand using rake:
-
-`rake spec:selenium:sauce`
-
-### Example Test::Unit test for Rails
-
-Here's an example test for Test::Unit.  Drop something like this in test/selenium/example\_test.rb:
-
-    require "test_helper"
+```bash
+    % gem install sauce-cucumber
+```
 
-    class DemoTest < Sauce::RailsTestCase
-      test "my app", do
-        s.get 'http://localhost:3001/'
-        assert s.page_source.include? 'Welcome aboard'
-      end
-    end
+And then read more how to get started with [Cucumber and Capybara on this
+wiki
+page](https://github.com/saucelabs/sauce\_ruby/wiki/Cucumber-and-Capybara).
 
-Here's how you run Test::Unit tests with Sauce OnDemand using rake:
 
-`rake test:selenium:sauce`
 
 
-### Contributing to the Gem
+## Contributing to the Gem
 
-*  Fork the project.
-*  Make your feature addition or bug fix.
-*  Please add RSpec tests for your changes, as we don't create a new release of the gem unless all tests are passing.
-*  Commit
-*  Send a pull request. Bonus points for topic branches.
+* Fork the GitHub project
+* Create a branch to perform your work in, this will help make your pull
+  request more clear.
+* Write some RSpec tests to demonstrate your desired capability or exhibit the
+  bug you're fixing.
+* Make your feature addition or bug fix.
+* Commit
+* Send a pull request! :)
 
 
 ### Testing the Gem
 
 Running the full test suite will require [RVM](http://rvm.beginrescueend.com)
 
-* Set SAUCE_USERNAME and SAUCE_ACCESS_KEY in your environment to valid Sauce OnDemand credentials
-* bundle install
-* rake spec:unit # Will just run the unit tests
-* rake test      # Will run *all* the tests and can be slow
+* Set `SAUCE_USERNAME` and `SAUCE_ACCESS_KEY` in your environment to valid Sauce credentials **or** create an `ondemand.yml` in the following format:
+
+        access_key: <yourkeyhere>
+        username: <yourusernamehere>
 
+* Invoke `bundle install` to install the gems necessary to work with the Sauce
+  gem
+* Running `rake spec:unit` will run the [RSpec](https://github.com/rspec/rspec) unit tests
+* If you'd like to run the *entire* test suit, `rake test` will run all the
+  integration tests, but requires the Sauce credentials to be set up properly
+  as these tests will run actual jobs on Sauce.

data/Rakefile

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'bundler'
 require 'rake/testtask'
 require 'rspec/core/rake_task'
+require 'shellwords'
 
 Bundler::GemHelper.install_tasks
 

data/gems/sauce-cucumber/lib/sauce/cucumber.rb

@@ -96,8 +96,7 @@ module Sauce
         block.call
 
         # Quit the driver to allow for the generation of a new session_id
-        driver.browser.quit
-        driver.instance_variable_set(:@browser, nil)
+        driver.finish!
 
         unless job.nil?
           job.passed = !scenario.failed?

data/gems/sauce-cucumber/sauce-cucumber.gemspec

@@ -13,5 +13,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "sauce-cucumber"
   gem.require_paths = ["lib"]
-  gem.version       = "#{Sauce::MAJOR_VERSION}.0"
+  gem.version       = "#{Sauce::MAJOR_VERSION}.1"
+
+  gem.add_dependency('sauce', ">= #{Sauce::MAJOR_VERSION}.0")
+  gem.add_dependency('cucumber', '>= 1.2.0')
 end

data/gems/sauce-jasmine/sauce-jasmine.gemspec

@@ -13,5 +13,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "sauce-jasmine"
   gem.require_paths = ["lib"]
-  gem.version       = "#{Sauce::MAJOR_VERSION}.0"
+  gem.version       = "#{Sauce::MAJOR_VERSION}.1"
+
+
+  gem.add_dependency('sauce', ">= #{Sauce::MAJOR_VERSION}.0")
+  gem.add_dependency('jasmine', '>= 1.2.0')
 end

data/lib/sauce/capybara.rb

@@ -75,12 +75,17 @@ module Sauce
 
           @browser = Sauce::Selenium2.new
           at_exit do
-            @browser.quit if @browser
-            $sauce_tunnel.disconnect if $sauce_tunnel
+            finish!
           end
         end
         @browser
       end
+
+      def finish!
+        @browser.quit if @browser
+        @browser = nil
+        $sauce_tunnel.disconnect if $sauce_tunnel
+      end
     end
   end
 end

data/lib/sauce/config.rb

@@ -33,7 +33,8 @@ module Sauce
 
     ENVIRONMENT_VARIABLES = %w{SAUCE_HOST SAUCE_PORT SAUCE_BROWSER_URL SAUCE_USERNAME
         SAUCE_ACCESS_KEY SAUCE_OS SAUCE_BROWSER SAUCE_BROWSER_VERSION SAUCE_JOB_NAME
-        SAUCE_FIREFOX_PROFILE_URL SAUCE_USER_EXTENSIONS_URL}
+        SAUCE_FIREFOX_PROFILE_URL SAUCE_USER_EXTENSIONS_URL
+        SAUCE_ONDEMAND_BROWSERS}
 
     PLATFORMS = {
       "Windows 2003" => "WINDOWS",
@@ -251,6 +252,11 @@ module Sauce
         opts['SAUCE_BROWSER_URL'] = "http://#{env['URL']}/"
       end
 
+      if env.include? 'SAUCE_ONDEMAND_BROWSERS'
+        browsers = JSON.parse(env['SAUCE_ONDEMAND_BROWSERS'])
+        opts[:browsers] = browsers.map { |x| [x['os'], x['browser'], x['browser-version']] }
+      end
+
       if env.include? 'SAUCE_BROWSERS'
         browsers = JSON.parse(env['SAUCE_BROWSERS'])
         opts[:browsers] = browsers.map { |x| [x['os'], x['browser'], x['version']] }

data/lib/sauce/version.rb

@@ -1,4 +1,4 @@
 
 module Sauce
-  MAJOR_VERSION = '2.1'
+  MAJOR_VERSION = '2.2'
 end

data/spec/sauce/capybara_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 require 'sauce/capybara'
 
 describe Sauce::Capybara do
@@ -37,6 +37,28 @@ describe Sauce::Capybara do
   end
 
   describe Sauce::Capybara::Driver do
+    let(:app) { double('Mock App for Driver') }
+    let(:driver) { Sauce::Capybara::Driver.new(app) }
+
+    describe '#finish' do
+      let(:browser) { double('Sauce::Selenium2 mock') }
+
+      before :each do
+        driver.instance_variable_set(:@browser, browser)
+      end
+
+      it 'should quit the @browser' do
+        browser.should_receive(:quit)
+        driver.finish!
+      end
+
+      it 'should nil out @browser' do
+        browser.stub(:quit)
+        driver.finish!
+        expect(driver.instance_variable_get(:@browser)).to be_nil
+      end
+    end
+
     describe '#browser' do
       before :each do
         # Stub out the selenium driver startup
@@ -49,70 +71,62 @@ describe Sauce::Capybara do
             c[:start_tunnel] = false
           end
 
-          driver = Sauce::Capybara::Driver.new(nil)
           driver.browser
         end
       end
     end
-    context 'with a mock app' do
-      let(:app) { double('Mock App for Driver') }
-
-      subject do
-        Sauce::Capybara::Driver.new(app)
-      end
 
-      describe '#find' do
-        let(:selector) { '#lol' }
+    describe '#find' do
+      let(:selector) { '#lol' }
 
-        context 'with an environment override' do
-          before :each do
-            ENV['SAUCE_DISABLE_RETRY'] = '1'
-          end
+      context 'with an environment override' do
+        before :each do
+          ENV['SAUCE_DISABLE_RETRY'] = '1'
+        end
 
-          it 'should not retry and raise the error' do
-          subject.should_receive(:base_find).with(selector).and_raise(Selenium::WebDriver::Error::UnknownError)
+        it 'should not retry and raise the error' do
+          driver.should_receive(:base_find).with(selector).and_raise(Selenium::WebDriver::Error::UnknownError)
 
           expect {
-            subject.find(selector)
+            driver.find(selector)
           }.to raise_error(Selenium::WebDriver::Error::UnknownError)
-          end
-
-          after :each do
-            ENV['SAUCE_DISABLE_RETRY'] = nil
-          end
         end
 
-        it 'should route through handle_retry' do
-          subject.should_receive(:base_find).with(selector) # BLECH
-          subject.find(selector)
+        after :each do
+          ENV['SAUCE_DISABLE_RETRY'] = nil
         end
+      end
 
-        it 'should retry 3 times and then raise' do
-          subject.should_receive(:base_find).with(selector).exactly(4).times.and_raise(Selenium::WebDriver::Error::UnknownError)
-
-          expect {
-            subject.find(selector)
-          }.to raise_error(Selenium::WebDriver::Error::UnknownError)
-        end
+      it 'should route through handle_retry' do
+        driver.should_receive(:base_find).with(selector) # BLECH
+        driver.find(selector)
       end
 
-      describe '#visit' do
-        it 'should route through #handle_retry' do
-          path = '/lol'
-          subject.should_receive(:base_visit).with(path)
-          subject.visit(path)
-        end
+      it 'should retry 3 times and then raise' do
+        driver.should_receive(:base_find).with(selector).exactly(4).times.and_raise(Selenium::WebDriver::Error::UnknownError)
+
+        expect {
+          driver.find(selector)
+        }.to raise_error(Selenium::WebDriver::Error::UnknownError)
       end
+    end
 
-      describe '#current_url' do
-        it 'should route through #handle_retry' do
-          url = 'http://lol'
-          subject.should_receive(:base_current_url).and_return(url)
-          subject.current_url.should == url
-        end
+    describe '#visit' do
+      it 'should route through #handle_retry' do
+        path = '/lol'
+        driver.should_receive(:base_visit).with(path)
+        driver.visit(path)
       end
+    end
 
+    describe '#current_url' do
+      it 'should route through #handle_retry' do
+        url = 'http://lol'
+        driver.should_receive(:base_current_url).and_return(url)
+        driver.current_url.should == url
+      end
     end
+
   end
 
   describe '#install_hooks' do

data/spec/sauce/config_spec.rb

@@ -73,6 +73,19 @@ describe Sauce::Config do
       end
     end
 
+    it 'should create a browser string when running under the Jenkins plugin' do
+      browsers_string = "[{\"os\":\"LINUX\",\"browser\":\"opera\",\"url\":\"sauce-ondemand:?os=Linux&browser=opera&browser-version=12\",\"browser-version\":\"12\"}]"
+      browsers = JSON.parse(browsers_string)
+      ENV['SAUCE_ONDEMAND_BROWSERS'] = browsers_string
+
+      config = Sauce::Config.new
+      result = JSON.parse(config.to_browser_string)
+
+      result['os'].should == browsers.first['os']
+      result['browser'].should == browsers.first['browser']
+      result['browser-version'].should == browsers.first['browser-version']
+    end
+
     it 'should create a browser string from the environment' do
       ENV['SAUCE_USERNAME'] = "test_user"
       ENV['SAUCE_ACCESS_KEY'] = "test_access"

metadata

@@ -1,185 +1,138 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sauce
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 2.2.0
   prerelease: 
-  segments: 
-  - 2
-  - 1
-  - 0
-  version: 2.1.0
 platform: ruby
-authors: 
+authors:
 - Eric Allen
 - Sean Grove
 - Steven Hazel
 - R. Tyler Croy
-- "Santiago Suarez Ordo\xC3\xB1ez"
+- Santiago Suarez Ordoñez
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
+date: 2012-11-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: net-http-persistent
+  requirement: &18044360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
+  version_requirements: *18044360
+- !ruby/object:Gem::Dependency
   name: capybara
+  requirement: &18059040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
+  version_requirements: *18059040
+- !ruby/object:Gem::Dependency
   name: rest-client
+  requirement: &18057940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
+  version_requirements: *18057940
+- !ruby/object:Gem::Dependency
   name: net-ssh
+  requirement: &18056540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id005
+  version_requirements: *18056540
+- !ruby/object:Gem::Dependency
   name: net-ssh-gateway
+  requirement: &18055200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *18055200
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: &18053940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 1
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.2
-  requirement: *id006
-  name: selenium-webdriver
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *18053940
+- !ruby/object:Gem::Dependency
+  name: childprocess
+  requirement: &18052240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 1
-        - 6
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.6
-  requirement: *id007
-  name: childprocess
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *18052240
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &18066500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.0
-  requirement: *id008
-  name: json
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *18066500
+- !ruby/object:Gem::Dependency
+  name: cmdparse
+  requirement: &18063760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 0
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.2
-  requirement: *id009
-  name: cmdparse
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *18063760
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: &18061180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.0
-  requirement: *id010
-  name: highline
   type: :runtime
-description: A Ruby helper for running tests in Sauce OnDemand, Sauce Labs' browsers in the cloud service
+  prerelease: false
+  version_requirements: *18061180
+description: A Ruby helper for running tests in Sauce OnDemand, Sauce Labs' browsers
+  in the cloud service
 email: help@saucelabs.com
-executables: 
+executables:
 - sauce
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gitignore
 - Gemfile
@@ -229,43 +182,34 @@ files:
 - spec/sauce/selenium_spec.rb
 - spec/spec_helper.rb
 - support/Sauce-Connect.jar
-- test/helper.rb
-- test/test_integrations.rb
-- test/test_testcase.rb
 homepage: http://github.com/saucelabs/sauce_ruby
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2117623043430577993
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 2117623043430577993
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A Ruby helper for running tests in Sauce OnDemand
-test_files: 
-- test/test_testcase.rb
-- test/test_integrations.rb
-- test/helper.rb
+test_files: []

data/test/helper.rb

@@ -1,35 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'net/telnet'
-require 'fileutils'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'sauce'
-
-include Sauce::Utilities
-
-Sauce.config do |config|
-  config.browsers = [
-    ["Windows 2003", "firefox", "3.6."],
-    ["Windows 2003", "iexplore", "8."]
-  ]
-  config.browser_url = "http://saucelabs.com"
-
-  #config.application_host = "localhost"
-  #config.application_port = "4444"
-end
-
-def ensure_rvm_installed
-  rvm_executable = File.expand_path("~/.rvm/bin/rvm")
-  if File.exist? rvm_executable
-    unless defined?(RVM)
-      rvm_lib_path = File.expand_path("~/.rvm/lib")
-      $LOAD_PATH.unshift(rvm_lib_path) unless $LOAD_PATH.include?(rvm_lib_path)
-      require 'rvm'
-    end
-  else
-    raise "You do not have RVM installed. It is required for the integration tests.\n" +
-      "Please install it from http://rvm.beginrescueend.com/"
-  end
-end

data/test/test_integrations.rb

@@ -1,202 +0,0 @@
-require File.expand_path("../helper.rb", __FILE__)
-
-class TestIntegrations < Test::Unit::TestCase
-  @@globally_setup = false
-
-  def setup
-    if !@@globally_setup
-      ensure_rvm_installed
-      Dir.chdir File.expand_path("../..", __FILE__) do
-        silence_stream(STDOUT) do
-          system("gem build sauce.gemspec")
-        end
-      end
-      ENV['SAUCE_GEM'] = File.expand_path("../../"+Dir.entries(".").select {|f| f =~ /sauce-.*.gem/}.sort.last, __FILE__)
-      @@globally_setup = true
-    end
-  end
-
-  def run_with_ruby(ruby_version, test)
-    ruby_version = RVM.list_strings.find {|version| version =~ /#{ruby_version}/}
-    if ruby_version.nil?
-      RVM.install ruby_version
-      ruby_version = RVM.list_strings.find {|version| version =~ /#{ruby_version}/}
-    end
-
-    gemset_name = "saucegem_#{test.to_s}"
-    rubie = RVM.environment(ruby_version)
-    rubie.gemset.create gemset_name
-    begin
-      rubie = RVM.environment("#{ruby_version}@#{gemset_name}")
-      send(test, rubie)
-    ensure
-      rubie.gemset.delete gemset_name
-    end
-  end
-
-  def run_in_environment(env, command)
-    result = env.run(command)
-    assert result.successful?, result.stderr
-  end
-
-  def in_tempdir
-    oldwd = Dir.pwd
-    temp = File.join(Dir.tmpdir, "sauce_gem_integration_test_#{rand(100000)}")
-    Dir.mkdir(temp)
-    Dir.chdir(temp)
-    begin
-      yield temp
-    ensure
-      Dir.chdir(oldwd)
-      FileUtils.remove_dir(temp)
-    end
-  end
-
-  def with_rails_3_environment(env)
-    in_tempdir do |temp|
-        run_in_environment(env, "gem install rails --no-rdoc --no-ri")
-        run_in_environment(env, "rails new rails3_testapp")
-        Dir.chdir("rails3_testapp")
-        run_in_environment(env, "bundle install")
-        run_in_environment(env, "rake db:migrate")
-        yield
-    end
-  end
-
-  def with_rails_2_environment(env)
-    in_tempdir do |temp|
-      run_in_environment(env, "gem install rails -v 2.3.10 --no-rdoc --no-ri")
-      run_in_environment(env, "gem install sqlite3 --no-rdoc --no-ri")
-      run_in_environment(env, "rails rails2_testapp")
-      Dir.chdir("rails2_testapp")
-      run_in_environment(env, "rake db:migrate")
-      yield
-    end
-  end
-
-  def recipe_rails3_testunit(env)
-    with_rails_3_environment(env) do
-      # Add some Sauce
-      open("Gemfile", 'a') do |f|
-        f.puts "gem 'sauce'"
-      end
-      run_in_environment(env, "gem install \"$SAUCE_GEM\" --no-rdoc --no-ri")
-      run_in_environment(env, "bundle install")
-      run_in_environment(env, "rails generate sauce:install #{ENV['SAUCE_USERNAME']} #{ENV['SAUCE_ACCESS_KEY']}")
-
-      open("test/selenium/demo_test.rb", 'wb') do |file|
-        file.write(<<-EOF)
-          require "test_helper"
-
-          class DemoTest < Sauce::RailsTestCase
-            test "my app" do
-              page.open "/"
-              assert page.is_text_present("Welcome aboard")
-            end
-          end
-        EOF
-      end
-
-      run_in_environment(env, "rake test:selenium:sauce")
-      run_in_environment(env, "rake test:selenium:local") unless ENV['SAUCE_TEST_NO_LOCAL']
-    end
-  end
-
-  def recipe_rails3_rspec(env)
-    with_rails_3_environment(env) do
-      open("Gemfile", 'a') do |f|
-        f.puts "gem 'sauce'"
-        f.puts "gem 'rspec-rails'"
-      end
-      run_in_environment(env, "gem install \"$SAUCE_GEM\" --no-rdoc --no-ri")
-      run_in_environment(env, "bundle install")
-      run_in_environment(env, "rails generate rspec:install")
-
-      # Add some Sauce
-      run_in_environment(env, "rails generate sauce:install #{ENV['SAUCE_USERNAME']} #{ENV['SAUCE_ACCESS_KEY']}")
-
-      open("spec/selenium/demo_spec.rb", 'wb') do |file|
-        file.write(<<-EOF)
-          require "spec_helper"
-
-          describe "my app" do
-            it "should have a home page" do
-              page.open "/"
-              page.is_text_present("Welcome aboard").should be_true
-            end
-          end
-        EOF
-      end
-
-      run_in_environment(env, "rake spec:selenium:sauce")
-      run_in_environment(env, "rake spec:selenium:local") unless ENV['SAUCE_TEST_NO_LOCAL']
-    end
-  end
-
-  def recipe_rails2_testunit(env)
-    with_rails_2_environment(env) do
-      run_in_environment(env, "gem install \"$SAUCE_GEM\" --no-rdoc --no-ri")
-      run_in_environment(env, "script/generate sauce #{ENV['SAUCE_USERNAME']} #{ENV['SAUCE_ACCESS_KEY']}")
-
-      open("test/selenium/demo_test.rb", 'wb') do |file|
-        file.write(<<-EOF)
-          require "test_helper"
-
-          class DemoTest < Sauce::RailsTestCase
-            test "my app" do
-              page.open "/"
-              assert page.is_text_present("Welcome aboard")
-            end
-          end
-        EOF
-      end
-
-      run_in_environment(env, "rake test:selenium:sauce")
-      run_in_environment(env, "rake test:selenium:local") unless ENV['SAUCE_TEST_NO_LOCAL']
-    end
-  end
-
-  def recipe_rails2_rspec(env)
-    with_rails_2_environment(env) do
-
-      run_in_environment(env, "gem install rspec-rails -v '< 2' --no-rdoc --no-ri")
-      if env.environment_name =~ /^ruby-1.9.*/
-        # newer versions of hoe get angry
-        run_in_environment(env, "gem install hoe -v 1.5.1 --no-rdoc --no-ri")
-        # this is a strange dependency...
-        run_in_environment(env, "gem install test-unit -v 1.2.3 --no-rdoc --no-ri")
-      end
-      run_in_environment(env, "script/generate rspec")
-
-      # Add some Sauce
-      run_in_environment(env, "gem install \"$SAUCE_GEM\" --no-rdoc --no-ri")
-      run_in_environment(env, "script/generate sauce #{ENV['SAUCE_USERNAME']} #{ENV['SAUCE_ACCESS_KEY']}")
-
-      open("spec/selenium/demo_spec.rb", 'wb') do |file|
-        file.write(<<-EOF)
-          require "spec_helper"
-
-          describe "my app" do
-            it "should have a home page" do
-              page.open "/"
-              page.is_text_present("Welcome aboard").should be_true
-            end
-          end
-        EOF
-      end
-
-      run_in_environment(env, "rake spec:selenium:sauce --trace")
-      run_in_environment(env, "rake spec:selenium:local") unless ENV['SAUCE_TEST_NO_LOCAL']
-    end
-  end
-
-  # Turn the recipes into tests
-  self.instance_methods(false).select {|m| m =~ /recipe_.*/ }.each do |recipe|
-    define_method(("test_ruby18_"+recipe).to_sym) do
-      run_with_ruby("ruby-1.8.7", recipe.to_sym)
-    end
-    define_method(("test_ruby19_"+recipe).to_sym) do
-      run_with_ruby("ruby-1.9.2", recipe.to_sym)
-    end
-  end
-end

data/test/test_testcase.rb

@@ -1,13 +0,0 @@
-require File.expand_path("../helper", __FILE__)
-
-class TestSauceTestCase < Sauce::TestCase
-  self.selenium_flags = {:trustAllSSLCertificates => false}
-  self.sauce_config = {:browser_url => "https://cacert.org"}
-
-  def test_turning_off_trustAllSSLCertificates
-    selenium.set_timeout("5000")
-    assert_raise Selenium::Client::CommandError do
-      selenium.open("https://cacert.org")
-    end
-  end
-end