sauce 2.5.1 → 2.5.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTgwY2IyMTZlNDU1ODM2OTkxMzVjNjE2MzQzMThhMzE4MDhjNDA0NQ==
+    ZjE4ZWNmYmY5YTI3NDNjM2IzYTg3M2EwYWVmOGEwM2EzZmFiMTA3Nw==
   data.tar.gz: !binary |-
-    OTMwODQxYjk2ZjM0YWViZWFjZjkzOTQxMDFlN2VkZThhZGEwYzliOQ==
+    NmZiN2M0NWZkYzE2NjAxMmYxZDY0NDgyYzYzNzM3OGI0YjcwNmQyMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZWVlMzk2NjMzYTNlYTZjZGIzY2E4MWZhOTE1MTE0YzQwMzk3ZmIyNjFlYzQ4
-    M2ZmMjU3MzAyODViOGIyMWY2NWExOTBkNDc1NDIxZDNmY2U0OWY0MGEyOTMy
-    Y2JhZDdmNTBlZjBiZmMzYzkxNWM0ZWRmMzljNmZlMzdjMDBjMDA=
+    NmRiZDYxZWE0ZTIxNTg1ZTFiNTZiYWRlMDYxZTA0Yjg2MTBhN2U5ZTdlMjVh
+    NDY3ZThkMzhlZWI4ZjNiOTdlMDBmMGM1ZTYyZTg0YTIyYjViNjRhYTZiYmYw
+    MzQyMjVjNjZlY2FkYzhiOWZlNDE5Y2I1M2ZlZjM5Mzg0ZmQ3MTg=
   data.tar.gz: !binary |-
-    MzA4Yjk5MmFiNTQ5Y2IwZGY0N2I5N2NjMjExNjI3YTIyZDIwOGVkYWEzMzg4
-    MjJkMmU5ODkwNjU3ZDlhMGM3OTYzNWUzMGU1NDkwODZhYjZiMTdhNGQ1YWMx
-    OTIwMDY4YzAwMmJiY2MxZDM2NThhMDg5YmUwNGFkNmNmOTZhNzk=
+    MjExNmMxMDQxMDA0NDA5NDM0ZjhiMWI2YmUzOGVkZmE1OTY0ZWFkYTcwYWUz
+    ODFjY2ZlMzNmY2M0YzRiNzcyMDYyOGRhY2Q0MmRhZTE4YmRiNDdjODg5YjVj
+    ZGM5OTA4N2MzNWVlZDEzZDA2YjgyYTRkYjZkZTMzOTYwYTMwYzg=

data/lib/sauce/capybara.rb

@@ -4,26 +4,15 @@ require 'sauce/config'
 require 'sauce/selenium'
 require 'sauce/version'
 
+require 'sauce/utilities'
+
 
 $sauce_tunnel = nil
 
 module Sauce
   module Capybara
     def connect_tunnel(options={})
-      begin
-        require 'sauce/connect'
-      rescue LoadError
-        puts 'Please install the `sauce-connect` gem if you intend on using Sauce Connect with your tests!'
-        raise
-      end
-
-      unless $sauce_tunnel.nil?
-        return $sauce_tunnel
-      end
-      $sauce_tunnel = Sauce::Connect.new(options)
-      $sauce_tunnel.connect
-      $sauce_tunnel.wait_until_ready
-      $sauce_tunnel
+      Sauce::Utilities::Connect.start(options)
     end
     module_function :connect_tunnel
 
@@ -129,7 +118,7 @@ module Sauce
       def finish!
         @browser.quit if existing_browser?
         @browser = nil
-        $sauce_tunnel.disconnect if $sauce_tunnel
+        Sauce::Utilities::Connect.close
       end
 
       def render(path)

data/lib/sauce/utilities.rb

@@ -31,6 +31,39 @@ module Sauce
       end
     end
 
+    class Connect
+
+      def self.start(options={})
+        begin
+          require "sauce/connect"
+        rescue LoadError => e
+          STDERR.puts <<-ERROR
+Please install the `sauce-connect` gem if you intend on using Sauce Connect with your tests!
+
+If you don't wish to use Sauce Connect, set [:start_tunnel] to false:
+  Sauce.config do |config|
+    config[:start_tunnel] = false
+  end
+          ERROR
+          exit(1)
+        end
+
+        unless @tunnel
+          @tunnel = Sauce::Connect.new options
+          @tunnel.connect
+          @tunnel.wait_until_ready
+        end
+          @tunnel
+      end
+
+      def self.close
+        if @tunnel
+          @tunnel.disconnect
+          @tunnel = nil
+        end
+      end
+    end
+
     class RailsServer
       include Sauce::Utilities
 

data/lib/sauce/version.rb

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

data/spec/sauce/capybara_spec.rb

@@ -3,11 +3,12 @@ require 'sauce/capybara'
 require 'sauce/connect'
 
 describe Sauce::Capybara do
-  describe '#connect_tunnel' do
-    before :each do
-      $sauce_tunnel = nil
-    end
 
+  after :each do
+    Sauce::Utilities::Connect.instance_variable_set(:@tunnel, false)
+  end
+
+  describe '#connect_tunnel' do
     let(:connector) do
       connector = double()
       connector.should_receive(:connect)
@@ -15,13 +16,8 @@ describe Sauce::Capybara do
       connector
     end
 
-    it 'should not do anything if the sauce tunnel exists' do
-      $sauce_tunnel = 1337
-      Sauce::Capybara.connect_tunnel.should == 1337
-    end
-
     it 'should connect if the tunnel is not connected' do
-      Sauce::Connect.should_receive(:new).and_return(connector)
+      Sauce::Connect.should_receive(:new).with(anything).and_return(connector)
 
       Sauce::Capybara.connect_tunnel
     end
@@ -31,10 +27,6 @@ describe Sauce::Capybara do
                     hash_including(:quiet => true)).and_return(connector)
       Sauce::Capybara.connect_tunnel(:quiet => true)
     end
-
-    after :each do
-      $sauce_tunnel = nil
-    end
   end
 
   describe Sauce::Capybara::Driver do

data/spec/sauce/cucumber_spec.rb

@@ -9,6 +9,10 @@ module Sauce::Capybara
     include Sauce::Capybara::Cucumber
     include Sauce::Cucumber::SpecHelper
 
+    before :each do
+      Sauce::Utilities::Connect.stub!(:start) {}
+    end
+
     describe '#use_sauce_driver' do
       before :each do
         ::Capybara.current_driver = :test
@@ -109,6 +113,53 @@ module Sauce::Capybara
 
       end
 
+      context "when using sauce/connect" do
+        let(:feature) do
+          """
+          Feature: A dummy feature
+            @selenium
+            Scenario: A dummy scenario
+              Given a scenario
+              When I raise no exceptions
+          """
+        end
+
+        before :each do
+          Sauce::Utilities::Connect.rspec_reset
+
+          Sauce.config do |c|
+            c[:start_tunnel] = true
+          end
+          $ran_scenario = nil
+        end
+
+        after :all do
+          Sauce::Utilities::Connect.stub!(:start) {}
+        end
+
+        it 'should have set up a tunnel' do
+          define_steps do
+            Given /^a scenario$/ do
+            end
+            When /^I raise no exceptions$/ do
+              $ran_scenario = true
+            end
+            # Set up and invoke our defined Around hook
+            Around('@selenium') do |scenario, block|
+              # We need to fully reference the module function here due to a
+              # change in scoping that will happen to this block courtesy of
+              # define_steps
+              Sauce::Capybara::Cucumber.around_hook(scenario, block)
+            end
+          end
+
+          # Make sure we actually configure ourselves
+          Sauce::Utilities::Connect.should_receive(:start).and_return {true}
+          run_defined_feature feature
+          $ran_scenario.should be true
+        end
+      end
+
       context 'with a correct scenario' do
         let(:feature) do
           """

data/spec/sauce/utilities_spec.rb

@@ -0,0 +1,82 @@
+require "spec_helper"
+
+describe "Sauce::Utilities::Connect" do
+
+  before :each do
+    @mock_tunnel = double(Sauce::Connect.new)
+  end
+
+  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
+      @mock_tunnel.stub(:wait_until_ready).and_return true
+      Sauce::Connect.should_receive(:new).with(anything) {@mock_tunnel}
+      Sauce::Utilities::Connect.start
+    end
+
+    it "should throw an exception when Sauce Connect is not included" do
+      Object.should_receive(:require).with("sauce/connect").and_raise LoadError
+
+      lambda {Sauce::Utilities::Connect.start}.should raise_error SystemExit
+    end
+
+    it "should connect the new tunnel" do
+      Sauce::Connect.rspec_reset
+      @mock_tunnel.should_receive(:connect).with().and_return(true)
+      @mock_tunnel.should_receive(:wait_until_ready).and_return(true)
+
+      Sauce::Connect.stub!(:new).with(anything).and_return @mock_tunnel
+
+      Sauce::Utilities::Connect.start
+    end
+
+    it "should return the tunnel when done" do
+      @mock_tunnel.stub(:connect).and_return true
+      @mock_tunnel.stub(:wait_until_ready).and_return true
+      Sauce::Connect.should_receive(:new).with(anything) {@mock_tunnel}
+      tunnel = Sauce::Utilities::Connect.start
+      tunnel.should be @mock_tunnel
+    end
+
+    it "only opens one tunnel" do
+      @mock_tunnel.stub(:connect).and_return true
+      @mock_tunnel.stub(:wait_until_ready).and_return true
+      Sauce::Connect.should_receive(:new).with(anything) {@mock_tunnel}
+      tunnel = Sauce::Utilities::Connect.start
+
+      tunnel_2 = Sauce::Utilities::Connect.start
+
+      tunnel.should be tunnel_2
+    end
+  end
+
+  describe "#close" do
+    it "makes the tunnel nil when terminated" do
+      @mock_tunnel.stub(:connect).and_return true
+      @mock_tunnel.stub(:wait_until_ready).and_return true
+      @mock_tunnel.should_receive(:disconnect).and_return true
+      Sauce::Connect.stub(:new).with(anything) {@mock_tunnel}
+      Sauce::Utilities::Connect.start
+
+      Sauce::Utilities::Connect.close
+      Sauce::Utilities::Connect.instance_variable_get(:@tunnel).should be nil
+    end
+
+    it "calls disconnect" do
+      @mock_tunnel.stub(:connect).and_return true
+      @mock_tunnel.stub(:wait_until_ready).and_return true
+      @mock_tunnel.should_receive(:disconnect).and_return true
+      Sauce::Connect.stub(:new).with(anything) {@mock_tunnel}
+      tunnel = Sauce::Utilities::Connect.start
+
+      Sauce::Utilities::Connect.close
+    end
+
+    it "does not error if no tunnel exists" do
+      Sauce::Utilities::Connect.close
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require "rspec"
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 ['sauce-jasmine', 'sauce-cucumber', 'sauce-connect'].each do |gem|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sauce
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors:
 - Dylan Lacey
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-02 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -29,6 +29,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
@@ -208,6 +222,7 @@ files:
 - spec/sauce/jasmine_spec.rb
 - spec/sauce/selenium_spec.rb
 - spec/sauce/test_unit_spec.rb
+- spec/sauce/utilities_spec.rb
 - spec/spec_helper.rb
 - bin/sauce
 homepage: http://github.com/sauce-labs/sauce_ruby
@@ -250,4 +265,5 @@ test_files:
 - spec/sauce/jasmine_spec.rb
 - spec/sauce/selenium_spec.rb
 - spec/sauce/test_unit_spec.rb
+- spec/sauce/utilities_spec.rb
 - spec/spec_helper.rb