sauce 0.13.1 → 0.13.2

data/Rakefile

@@ -34,6 +34,19 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
+namespace :test do
+  Rake::TestTask.new(:api) do |test|
+    test.libs << 'lib' << 'test'
+    test.pattern = 'test/api/test_*.rb'
+    test.verbose = true
+  end
+  Rake::TestTask.new(:integrations) do |test|
+    test.libs << 'lib' << 'test'
+    test.pattern = 'test/integrations/test_*.rb'
+    test.verbose = true
+  end
+end
+
 Rake::TestTask.new(:examples) do |test|
   test.libs << 'lib' << 'examples'
   test.pattern = 'examples/test_*.rb'

data/VERSION

@@ -1 +1 @@
-0.13.1
+0.13.2

data/lib/sauce/config.rb

@@ -26,6 +26,10 @@ module Sauce
         :local_application_port => "3001"
     }
 
+    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}
+
     def initialize(opts={})
       @opts = {}
       if opts != false

data/lib/sauce/integrations.rb

@@ -216,11 +216,12 @@ end
 
 if defined?(ActiveSupport::TestCase)
   module Sauce
-    class RailsTestCase < ::ActiveSupport::TestCase
-      attr_reader :selenium
+    module SeleniumForTestUnit
+      attr_reader :browser
 
-      alias_method :page, :selenium
-      alias_method :s, :selenium
+      alias_method :page, :browser
+      alias_method :s, :browser
+      alias_method :selenium, :browser
 
       def run(*args, &blk)
         if self.respond_to? :name
@@ -232,17 +233,17 @@ if defined?(ActiveSupport::TestCase)
           config = Sauce::Config.new
           config.browsers.each do |os, browser, version|
             if config.local?
-              @selenium = ::Selenium::Client::Driver.new(:host => "127.0.0.1",
+              @browser = ::Selenium::Client::Driver.new(:host => "127.0.0.1",
                                                          :port => 4444,
                                                          :browser => "*" + browser,
                                                          :url => "http://127.0.0.1:#{config.local_application_port}/")
             else
-              @selenium = Sauce::Selenium.new({:os => os, :browser => browser, :browser_version => version,
+              @browser = Sauce::Selenium.new({:os => os, :browser => browser, :browser_version => version,
                 :job_name => "#{my_name}"})
             end
-            @selenium.start
+            @browser.start
             super(*args, &blk)
-            @selenium.stop
+            @browser.stop
           end
         end
       end
@@ -251,5 +252,9 @@ if defined?(ActiveSupport::TestCase)
       def default_test
       end
     end
+
+    class RailsTestCase < ::ActiveSupport::TestCase
+      include SeleniumForTestUnit
+    end
   end
 end

data/test/integrations/test_rails2.rb

@@ -0,0 +1,19 @@
+require 'helper'
+require 'tmpdir'
+require 'fileutils'
+
+class TestRails2Integration < Test::Unit::TestCase
+  def setup
+    @dir = File.join(Dir.tmpdir, "sauce_gem_test_#{rand(100000)}")
+    Dir.mkdir(@dir)
+    Dir.chdir(@dir)
+    puts @dir
+  end
+
+  def test_foo
+  end
+
+  def teardown
+    FileUtils.remove_dir(@dir)
+  end
+end

data/test/test_config.rb

@@ -3,14 +3,25 @@ require 'helper'
 class TestConfig < Test::Unit::TestCase
   context "A new Config" do
     should "Generate a reasonable browser string from the environment" do
-      ENV['SAUCE_USERNAME'] = "test_user"
-      ENV['SAUCE_ACCESS_KEY'] = "test_access"
-      ENV['SAUCE_OS'] = "Linux"
-      ENV['SAUCE_BROWSER'] = "firefox"
-      ENV['SAUCE_BROWSER_VERSION'] = "3."
+      preserved_env = {}
+      Sauce::Config::ENVIRONMENT_VARIABLES.each do |key|
+        preserved_env[key] = ENV[key] if ENV[key]
+      end
+      begin
 
-      config = Sauce::Config.new
-      assert_equal "{\"name\":\"Unnamed Ruby job\",\"access-key\":\"test_access\",\"os\":\"Linux\",\"username\":\"test_user\",\"browser-version\":\"3.\",\"browser\":\"firefox\"}", config.to_browser_string
+        ENV['SAUCE_USERNAME'] = "test_user"
+        ENV['SAUCE_ACCESS_KEY'] = "test_access"
+        ENV['SAUCE_OS'] = "Linux"
+        ENV['SAUCE_BROWSER'] = "firefox"
+        ENV['SAUCE_BROWSER_VERSION'] = "3."
+
+        config = Sauce::Config.new
+        assert_equal "{\"name\":\"Unnamed Ruby job\",\"access-key\":\"test_access\",\"os\":\"Linux\",\"username\":\"test_user\",\"browser-version\":\"3.\",\"browser\":\"firefox\"}", config.to_browser_string
+      ensure
+        Sauce::Config::ENVIRONMENT_VARIABLES.each do |key|
+          ENV[key] = preserved_env[key] if preserved_env[key]
+        end
+      end
     end
 
     should "Generate a browser string from parameters" do

data/test/test_selenium.rb

@@ -4,8 +4,9 @@ class TestSelenium < Test::Unit::TestCase
   context "The Sauce Selenium driver" do
     should "Connect successfully using credentials from the environment" do
       assert ENV['SAUCE_USERNAME'], "You haven't configured a Sauce OnDemand username. Please set $SAUCE_USERNAME"
-      assert ENV['SAUCE_USERNAME'], "You haven't configured a Sauce OnDemand access key. Please set $SAUCE_ACCESS_KEY"
-      selenium = Sauce::Selenium.new()
+      assert ENV['SAUCE_ACCESS_KEY'], "You haven't configured a Sauce OnDemand access key. Please set $SAUCE_ACCESS_KEY"
+      selenium = Sauce::Selenium.new(:job_name => "Sauce gem test suite: test_selenium.rb",
+                                     :browser_url => "http://www.google.com/")
       selenium.start
       selenium.open "/"
       selenium.stop

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sauce
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 47
   prerelease: false
   segments: 
   - 0
   - 13
-  - 1
-  version: 0.13.1
+  - 2
+  version: 0.13.2
 platform: ruby
 authors: 
 - Sean Grove
@@ -218,12 +218,13 @@ files:
 - support/simplejson/ordered_dict.py
 - support/simplejson/scanner.py
 - support/simplejson/tool.py
+- test/api/test_jobs.rb
+- test/api/test_tunnels.rb
 - test/helper.rb
 - test/test_config.rb
 - test/test_connect.rb
-- test/test_jobs.rb
 - test/test_selenium.rb
-- test/test_tunnels.rb
+- test/integrations/test_rails2.rb
 has_rdoc: true
 homepage: http://github.com/saucelabs/sauce
 licenses: []
@@ -264,9 +265,10 @@ test_files:
 - examples/saucelabs_spec.rb
 - examples/test_saucelabs.rb
 - examples/test_saucelabs2.rb
+- test/api/test_jobs.rb
+- test/api/test_tunnels.rb
 - test/helper.rb
+- test/integrations/test_rails2.rb
 - test/test_config.rb
 - test/test_connect.rb
-- test/test_jobs.rb
 - test/test_selenium.rb
-- test/test_tunnels.rb