gondola 1.2.0 → 1.2.1

data/Gemfile.lock

@@ -1,11 +1,11 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    childprocess (0.1.7)
-      ffi (~> 0.6.3)
+    childprocess (0.1.8)
+      ffi (~> 1.0.6)
     cmdparse (2.0.3)
     fakeweb (1.3.0)
-    ffi (0.6.3)
+    ffi (1.0.7)
       rake (>= 0.8.7)
     git (1.2.5)
     highline (1.6.1)
@@ -19,12 +19,12 @@ GEM
     net-ssh (2.1.3)
     net-ssh-gateway (1.0.1)
       net-ssh (>= 1.99.1)
-    parallel (0.5.2)
+    parallel (0.5.3)
     rake (0.8.7)
     rest-client (1.6.1)
       mime-types (>= 1.16)
     rubyzip (0.9.4)
-    sauce (0.17.6)
+    sauce (0.19.0)
       childprocess (>= 0.1.6)
       cmdparse (>= 2.0.2)
       highline (>= 1.5.0)
@@ -32,10 +32,10 @@ GEM
       net-ssh
       net-ssh-gateway
       rest-client
-      selenium-webdriver (>= 0.1.2)
-    selenium-webdriver (0.1.3)
-      childprocess (~> 0.1.5)
-      ffi (~> 0.6.3)
+      selenium-webdriver (>= 0.1.4)
+    selenium-webdriver (0.1.4)
+      childprocess (>= 0.1.7)
+      ffi (>= 1.0.7)
       json_pure
       rubyzip
     shoulda (2.11.3)

data/gondola.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gondola}
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matthew Perry"]
-  s.date = %q{2011-03-24}
+  s.date = %q{2011-03-25}
   s.default_executable = %q{gondola}
   s.description = %q{
     Gondola is Ruby command line utility and as well as a library  which helps
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/gondola.rb",
     "lib/gondola/converter.rb",
     "lib/gondola/html_converter.rb",
+    "lib/gondola/selenium.rb",
     "lib/gondola/tester.rb",
     "lib/gondola/testrunner.rb",
     "lib/gondola/version.rb",
@@ -54,7 +55,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/perrym5/gondola}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.0}
+  s.rubygems_version = %q{1.6.1}
   s.summary = %q{Ruby command line utility and library for integrating the Selenium IDE more tightly with Sauce Labs' Ondemand services}
   s.test_files = [
     "test/helper.rb",

data/lib/gondola/selenium.rb

@@ -0,0 +1,21 @@
+# Gondola - selenium.rb:
+#   Subclass for overwriting some of the selenium
+#   gem's default error reporting behaviors.
+require 'sauce/selenium'
+
+module Gondola
+  class Selenium < ::Sauce::Selenium
+
+    # Same function definition as the selenium gem but without
+    # writing to standard out
+    def http_post(data)
+      start = Time.now
+      called_from = caller.detect{|line| line !~ /(selenium-client|vendor|usr\/lib\/ruby|\(eval\))/i}
+      http = Net::HTTP.new(@host, @port)
+      http.open_timeout = default_timeout_in_seconds
+      http.read_timeout = default_timeout_in_seconds
+      response = http.post('/selenium-server/driver/', data, ::Selenium::Client::HTTP_HEADERS)
+      [ response.body[0..1], response.body ]
+    end
+  end
+end

data/lib/gondola/tester.rb

@@ -4,6 +4,9 @@
 #   the need for a unit testing framework
 
 module Gondola
+  class AssertionError < RuntimeError
+  end
+
   class Tester
     attr_reader :cmd_num, :errors, :job_id
     attr_accessor :sel
@@ -20,13 +23,20 @@ module Gondola
         @sel.start()
         @job_id = @sel.session_id
         eval(@converter.ruby)
-      rescue RuntimeError => e
-        $stderr.puts e.message
+      rescue AssertionError => e
+      rescue ::Selenium::Client::CommandError => e
+        @errors.push({ :command => @converter.commands[@cmd_num],
+                       :error => e.message })
       ensure
         begin
+          if @errors.empty?
+            @sel.passed!
+          else
+            @sel.failed!
+          end
           @sel.stop()
-        rescue Selenium::Client::CommandError => e
-          $stderr.puts e.message + "(Most likely, the test was closed on Sauce Labs' end)"
+        rescue ::Selenium::Client::CommandError => e
+          $stderr.puts e.message + "(Most likely, the test was closed early on Sauce Labs' end)"
         end
       end
     end
@@ -38,27 +48,19 @@ module Gondola
     end
 
     def assert(expr)
-      unless verify(expr)
-        raise "Assertion Failed"
-      end
+      raise AssertionError, "Assertion Failed" unless verify(expr)
     end
 
     def assert_not(expr)
-      unless verify_not(expr)
-        raise "Assertion Failed"
-      end
+      raise AssertionError, "Assertion Failed" unless verify_not(expr)
     end
 
     def assert_equal(eq, expr)
-      unless verify_equal(eq, expr)
-        raise "Assertion Failed"
-      end
+      raise AssertionError, "Assertion Failed" unless verify_equal(eq, expr)
     end
 
     def assert_not_equal(eq, expr)
-      unless verify_not_equal(eq, expr)
-        raise "Assertion Failed"
-      end
+      raise AssertionError, "Assertion Failed" unless verify_not_equal(eq, expr)
     end
 
     def verify(expr)

data/lib/gondola/testrunner.rb

@@ -120,7 +120,7 @@ module Gondola
         # Add global information to this request
         request.merge! global
         # Request a new selenium object from Sauce
-        selenium = Sauce::Selenium.new(request)
+        selenium = Gondola::Selenium.new(request)
         # Begin test using a tester object
         tester = Gondola::Tester.new(selenium, converter)
         browser_string = "#{request[:os]} #{request[:browser]} #{request[:browser_version]}"

data/lib/gondola/version.rb

@@ -1,3 +1,3 @@
 module Gondola
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
 end

data/lib/gondola.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'gondola/selenium'
 require 'gondola/converter'
 require 'gondola/html_converter'
 require 'gondola/tester'

data/test/test_fail.rb

@@ -16,18 +16,14 @@ class TestFail < Test::Unit::TestCase
     should "result in a failing test" do
       VCR.use_cassette('failing_test1', :record => :new_episodes) do
         @runner.run({ :browsers => [{:os => "Windows 2003", :browser => "firefox", :browser_version => "3.6"}] })
-        expected = {
-          :name=>"gondola_agora_fail", 
-          :browser=>"Windows 2003 firefox 3.6", 
-          :id=>"e3faafda8d5b76e3cb1ca4c58a708f97", 
-          :result=>[{
-            :command=>{
-              :ruby=>"assert @sel.is_text_present(\"Producer FAIL\")\n"
-            }, 
-            :error=>"returned false, expecting true"
-        }]}
+        expected = [{
+          :command=>{
+            :ruby=>"assert @sel.is_text_present(\"Producer FAIL\")\n"
+          }, 
+          :error=>"returned false, expecting true"
+        }]
         assert @runner.results.size == 1
-        assert_equal expected, @runner.results[0]
+        assert_equal expected, @runner.results[0][:result]
       end
     end
   end
@@ -41,19 +37,15 @@ class TestFail < Test::Unit::TestCase
     should "result in a failing test" do
       VCR.use_cassette('failing_test2', :record => :new_episodes) do
         @runner.run({ :browsers => [{:os => "Windows 2003", :browser => "firefox", :browser_version => "3.6"}] })
-        expected = {
-          :name=>"gondola_agora_fail", 
-          :browser=>"Windows 2003 firefox 3.6", 
-          :id=>"e3faafda8d5b76e3cb1ca4c58a7152d9", 
-          :result=>[{
-            :command=>{
-              :original=>"assertTextPresent(\"Producer FAIL\")", 
-              :ruby=>"assert @sel.is_text_present(\"Producer FAIL\")"
-            }, 
-            :error=>"returned false, expecting true"
-        }]}
+        expected = [{
+          :command=>{
+            :original=>"assertTextPresent(\"Producer FAIL\")", 
+            :ruby=>"assert @sel.is_text_present(\"Producer FAIL\")"
+          }, 
+          :error=>"returned false, expecting true"
+        }]
         assert @runner.results.size == 1
-        assert_equal expected, @runner.results[0]
+        assert_equal expected, @runner.results[0][:result]
       end
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: gondola
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Matthew Perry
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-24 00:00:00 -04:00
+date: 2011-03-25 00:00:00 -04:00
 default_executable: gondola
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -111,6 +111,7 @@ files:
 - lib/gondola.rb
 - lib/gondola/converter.rb
 - lib/gondola/html_converter.rb
+- lib/gondola/selenium.rb
 - lib/gondola/tester.rb
 - lib/gondola/testrunner.rb
 - lib/gondola/version.rb
@@ -140,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 131885875
+      hash: -2033131404099204936
       segments: 
       - 0
       version: "0"
@@ -153,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Ruby command line utility and library for integrating the Selenium IDE more tightly with Sauce Labs' Ondemand services