watir-dom-wait 0.1.2 → 0.1.3

data/README.md

@@ -80,7 +80,7 @@ Watir::Dom::Wait.interval = 0.15
 
 By attaching `DOMSubtreeModified` event to element. It's supported in all major browsers (except Presto-powered Opera).
 
-Note, that it also rescues `Selenium::WebDriver::Error::StaleElementReferenceError` when waits for DOM.
+Note, that it also rescues `Selenium::WebDriver::Error::StaleElementReferenceError` and `Selenium::WebDriver::Error::JavascriptError` when waits for DOM.
 
 ## Contributors
 

data/lib/watir/dom/elements/element.rb

@@ -42,8 +42,16 @@ module Watir
         WhenDOMChangedDecorator.new(self, opts, message)
       end
 
-    rescue Selenium::WebDriver::Error::StaleElementReferenceError
-      locate
+    rescue Selenium::WebDriver::Error::StaleElementReferenceError, Selenium::WebDriver::Error::JavascriptError
+      # StaleElementReferenceError
+      #   element can become stale, so we just retry DOM waiting
+      #
+      # JavascriptError
+      #   in rare cases, args passed to execute script are not correct, for example:
+      #     correct:   [#<Watir::Body:0x6bb2ccb9de06cb92 located=false selector={:element=>(webdriver element)}>, 300, 3000]    [el, interval, delay]
+      #     incorrect: [0.3, 3000, nil]                                                                                         [interval, delay, ?]
+      #   TODO there might be some logic (bug?) in Selenium which does this
+      retry
     end
 
     #

data/lib/watir/dom/extensions/js/waitForDom.js

@@ -56,19 +56,21 @@ function Watir(options) {
   this.set(options);
 
   this.startedModifying = false;
-  this.domReady = 1;
+  this.domReady         = 1;
 
   this.bindDOMEvents();
   this.exitOnTimeout();
 };
 
 Watir.prototype.set = function (options) {
-  if (options == null) options = {};
+  if (options == null) { 
+    options = {};
+  }
 
-  this.el = options.el;
-  this.event = options.event || 'DOMSubtreeModified';
+  this.el       = options.el;
+  this.event    = options.event || 'DOMSubtreeModified';
   this.interval = options.interval;
-  this.delay = options.delay;
+  this.delay    = options.delay;
 
   this.forceReady = this.wrappedForceReady();
   this.startModifying = this.wrappedStartModifying();
@@ -120,7 +122,6 @@ Watir.prototype.addEventListener = (function() {
     return function (fn) {
       this.el.addEventListener(this.event, fn, false);
     };
-
   } else {
     return function (fn) {
       this.el.attachEvent('on' + this.event, fn)
@@ -133,7 +134,6 @@ Watir.prototype.removeEventListener = (function() {
     return function (fn) {
       this.el.removeEventListener(this.event, fn, false);
     };
-
   } else {
     return function (fn) {
       this.el.detachEvent('on' + this.event, fn)
@@ -142,7 +142,8 @@ Watir.prototype.removeEventListener = (function() {
 })();
 
 window.watir = new Watir({
-  el: arguments[0],
+  el:       arguments[0],
   interval: arguments[1] * 1000,
-  delay: arguments[2] * 1000,
+  delay:    arguments[2] * 1000,
 });
+

data/lib/watir/dom/wait/version.rb

@@ -1,7 +1,7 @@
 module Watir
   module Dom
     module Wait
-      VERSION = "0.1.2"
+      VERSION = "0.1.3"
     end # Wait
   end # Dom
 end # Watir

data/lib/watir-dom-wait.rb

@@ -0,0 +1 @@
+require 'watir/dom/wait'

data/spec/watir-dom-wait/element_spec.rb

@@ -6,24 +6,24 @@ describe Watir::Element do
       context "when block is not given" do
         it "waits using event handler" do
           @browser.button(:id => "quick").click
-          @browser.div.when_dom_changed.should have(20).spans
+          expect(@browser.div.when_dom_changed).to have(20).spans
         end
 
         it "may be run more than one time" do
           3.times do |i|
             @browser.button(:id => "quick").click
-            @browser.div.when_dom_changed.should have(20 * (i + 1)).spans
+            expect(@browser.div.when_dom_changed).to have(20 * (i + 1)).spans
           end
         end
 
         it "waits using custom interval" do
           @browser.button(:id => "long").click
-          @browser.div.when_dom_changed(:interval => 1.1).should have(5).spans
+          expect(@browser.div.when_dom_changed(:interval => 1.1)).to have(5).spans
         end
 
         it "raises timeout error" do
           @browser.button(:id => "quick").click
-          lambda { @browser.div.when_dom_changed(:timeout => 2).spans }.should raise_error(Watir::Wait::TimeoutError)
+          expect { @browser.div.when_dom_changed(:timeout => 2).spans }.to raise_error(Watir::Wait::TimeoutError)
         end
       end
 
@@ -31,36 +31,37 @@ describe Watir::Element do
         it "waits using event handler" do
           @browser.button(:id => "quick").click
           @browser.div.when_dom_changed do |div|
-            div.should have(20).spans
+            expect(div).to have(20).spans
           end
         end
 
         it "waits using custom interval" do
           @browser.button(:id => "long").click
           @browser.div.when_dom_changed(:interval => 1.1) do |div|
-            div.should have(5).spans
+            expect(div).to have(5).spans
           end
         end
 
         it "raises timeout error" do
           @browser.button(:id => "quick").click
-          lambda do
+          expect {
             @browser.div.when_dom_changed(:timeout => 2) { |div| div.spans }
-          end.should raise_error(Watir::Wait::TimeoutError)
+          }.to raise_error(Watir::Wait::TimeoutError)
         end
 
         it "returns block evaluation" do
           @browser.button(:id => "quick").click
-          @browser.div.when_dom_changed do |div|
+          size = @browser.div.when_dom_changed do |div|
             div.spans.size
-          end.should == 20
+          end
+          expect(size).to eq(20)
         end
       end
     end
 
     context "when DOM is not changed" do
       it "doesn't raise any exception" do
-        @browser.div.when_dom_changed.should have(0).spans
+        expect(@browser.div.when_dom_changed).to have(0).spans
       end
     end
 
@@ -77,9 +78,9 @@ describe Watir::Element do
         div = @browser.div(:id => 'container2')
         div.exists?
         @browser.refresh
-        lambda do
+        expect {
           div.when_dom_changed.text
-        end.should_not raise_error(Selenium::WebDriver::Error::StaleElementReferenceError)
+        }.not_to raise_error(Selenium::WebDriver::Error::StaleElementReferenceError)
       end
     end
   end
@@ -88,12 +89,12 @@ describe Watir::Element do
     it "calls #when_dom_changed" do
       div = @browser.div
       opts = { timeout: 1, interval: 2, delay: 3 }
-      div.should_receive(:when_dom_changed).with(opts)
+      expect(div).to receive(:when_dom_changed).with(opts)
       div.wait_until_dom_changed(opts)
     end
 
     it "returns nil" do
-      @browser.div.wait_until_dom_changed.should == nil
+      expect(@browser.div.wait_until_dom_changed).to eq(nil)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir-dom-wait
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
@@ -88,6 +88,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/watir-dom-wait.rb
 - lib/watir/dom/elements/element.rb
 - lib/watir/dom/extensions/js/waitForDom.js
 - lib/watir/dom/wait.rb
@@ -111,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3291543436130083017
+      hash: -357748089059915628
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -120,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3291543436130083017
+      hash: -357748089059915628
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23