watirsplash 2.2.0 → 2.3.0

data/Gemfile

@@ -9,7 +9,7 @@ platforms :mingw, :mswin do
 end
 
 gem "watir-webdriver", WatirSplash::Version::WATIR_WEBDRIVER
-gem "firewatir", ">= 1.9.3"
+gem "firewatir", ">= 1.9.4"
 gem "rspec", "~>2.6.0"
 gem "spork", "~>0.9.0.rc9"
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    watirsplash (2.1.1)
+    watirsplash (2.2.0)
       bundler (~> 1.0)
       rake (= 0.8.7)
       require_all
@@ -12,17 +12,18 @@ GEM
   remote: http://rubygems.org/
   specs:
     builder (3.0.0)
-    childprocess (0.2.1)
+    childprocess (0.2.2)
       ffi (~> 1.0.6)
     commonwatir (2.0.1)
       user-choices
     diff-lcs (1.1.2)
     ffi (1.0.9-x86-mingw32)
-    firewatir (1.9.3)
+    firewatir (1.9.4)
       commonwatir (>= 1.9.2)
     hoe (2.12.0)
       rake (~> 0.8)
-    json_pure (1.5.3)
+    json_pure (1.5.4)
+      spruz (~> 0.2.8)
     mini_magick (3.2.1)
       subexec (~> 0.0.4)
     nokogiri (1.5.0-x86-mingw32)
@@ -40,13 +41,14 @@ GEM
     rubyzip (0.9.4)
     s4t-utils (1.0.4)
       hoe (>= 1.3.0)
-    selenium-webdriver (2.4.0)
+    selenium-webdriver (2.5.0)
       childprocess (>= 0.2.1)
       ffi (>= 1.0.7)
       json_pure
       rubyzip
     spork (0.9.0.rc9-x86-mingw32)
       win32-process
+    spruz (0.2.13)
     subexec (0.0.4)
     syntax (1.0.0)
     thor (0.14.6)
@@ -61,7 +63,7 @@ GEM
       rautomation (~> 0.6.3)
       win32-process (>= 0.5.5)
       windows-pr (>= 0.6.6)
-    watir-webdriver (0.3.1)
+    watir-webdriver (0.3.3)
       selenium-webdriver (>= 0.2.2)
     win32-api (1.4.8-x86-mingw32)
     win32-process (0.6.5)
@@ -81,10 +83,10 @@ PLATFORMS
   x86-mingw32
 
 DEPENDENCIES
-  firewatir (>= 1.9.3)
+  firewatir (>= 1.9.4)
   rspec (~> 2.6.0)
   spork (~> 0.9.0.rc9)
   watir (= 2.0.1)
-  watir-webdriver (~> 0.3.1)
+  watir-webdriver (~> 0.3.3)
   watirsplash!
   win32screenshot (~> 1.0.5)

data/History.rdoc

@@ -1,3 +1,7 @@
+=== Version 2.3.0 / 2011-09-10
+
+ * add JavaScript errors detection for all supported frameworks & browsers - read more from wiki: https://github.com/jarmo/WatirSplash/wiki/Detecting-JavaScript-Errors
+
 === Version 2.2.0 / 2011-09-10
 
  * watir-webdriver/firefox is now the default framework under Linux and OS X

data/lib/watirsplash/browser.rb

@@ -1,5 +1,32 @@
 module WatirSplash
+  class JavaScriptError < RuntimeError; end
+
   class Browser
+    # raises an error if any JavaScript errors were found
+    JAVASCRIPT_ERRORS_CHECKER = lambda do |browser| 
+      error_message = browser.execute_script "#{browser.respond_to?(:driver) ? "return ": nil}window.__browserErrorMessage"
+
+      if error_message && !error_message.empty?
+        browser.execute_script "window.__browserErrorMessage = undefined"
+        raise JavaScriptError, "JavaScript error: #{error_message}"
+      end
+      
+      browser.execute_script %q[
+        if (!window.onErrorFn) {
+          window.onErrorFn = function(errorMsg, url, lineNumber) {
+                               window.__browserErrorMessage = errorMsg + " @ " + url + ":" + lineNumber;
+
+                               if (window.__onErrorFn)
+                                 window.__onErrorFn(errorMsg, url, lineNumber);
+
+                               return false;
+                             };
+
+          window.__onErrorFn = window.onerror;
+          window.onerror = window.onErrorFn;
+        }]
+    end
+          
     class << self
 
       attr_accessor :current
@@ -12,6 +39,7 @@ module WatirSplash
 
       def prepare browser
         self.current = browser
+        browser.add_checker JAVASCRIPT_ERRORS_CHECKER
         browser
       end
 

data/lib/watirsplash/frameworks/watir.rb

@@ -2,13 +2,6 @@ WatirSplash::Frameworks::Helper.load_gems "watir", "win32/screenshot"
 require "watirsplash/mini_magick_patch"
 require "watir/ie"
 
-module Watir
-  module PageCheckers
-    # raises an error if javascript error was found
-    JAVASCRIPT_ERRORS_CHECKER = lambda {|ie| raise "Expected no JavaScript errors to appear on page, but having some!" if ie.status =~ /Error on page/}
-  end
-end
-
 # patches for Watir
 module Watir
   class IE #:nodoc:all
@@ -17,8 +10,6 @@ module Watir
     def initialize suppress_new_window=nil
       _initialize suppress_new_window
       self.speed = :fast
-      @error_checkers ||= []
-      add_checker Watir::PageCheckers::JAVASCRIPT_ERRORS_CHECKER
     end
 
     def save_screenshot(params)

data/lib/watirsplash/version.rb

@@ -1,6 +1,6 @@
 module WatirSplash
   module Version
-    WATIRSPLASH = "2.2.0"
+    WATIRSPLASH = "2.3.0"
 
     # possible runtime dependencies
     WATIR = "2.0.1"

data/spec/browser_spec.rb

@@ -16,6 +16,21 @@ describe WatirSplash::Browser do
     browser.should == WatirSplash::Browser.current
   end
 
+  it "detects JavaScript errors" do
+    browser = WatirSplash::Browser.new
+    browser.goto "http://dl.dropbox.com/u/2731643/WatirSplash/test.html"
+    browser.execute_script("window.originalOnErrorExecuted").should_not be_true
+
+    expect {
+      browser.link(:id => "errorLink").click
+    }.to raise_error(WatirSplash::JavaScriptError, /JavaScript error:.*unexistingVar/)
+    browser.execute_script("window.originalOnErrorExecuted").should be_true    
+
+    expect {
+      browser.link(:id => "toggle").click
+    }.not_to raise_error
+  end
+
   after :each do
     WatirSplash::Browser.current.close
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watirsplash
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 2
-  - 2
+  - 3
   - 0
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors: 
 - Jarmo Pertman
@@ -173,7 +173,7 @@ rubyforge_project:
 rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
-summary: watirsplash 2.2.0
+summary: watirsplash 2.3.0
 test_files: 
 - spec/browser_spec.rb
 - spec/page_spec.rb