RubyGems - watir-dom-wait - Versions diffs - 0.3.3 → 0.4.0 - Mend

watir-dom-wait 0.3.3 → 0.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

checksums.yaml +5 -5
data/lib/watir/dom/elements/element.rb +3 -4
data/lib/watir/dom/extensions/js/waitForDom.js +1 -1
data/lib/watir-dom-wait.rb +14 -0
data/spec/spec_helper.rb +5 -1
data/spec/watir-dom-wait/element_spec.rb +26 -21
data/watir-dom-wait.gemspec +2 -3
metadata +8 -23

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7f58c8ee42532287c905e965095b1b51b10d8a5a
-  data.tar.gz: 68916d0b9e8a00999a460428727297b91378697a
+SHA256:
+  metadata.gz: 0b066817603bde9fef59bcc7274963517dc2291e06fdae4d5543c333a6588e24
+  data.tar.gz: 98adfb587832f044bf09b83d0910699ae15c7601242f5984af0faa3f4191bade
 SHA512:
-  metadata.gz: cdebe4f8e76f264593f2ed3ce7af40153a9b4e20778936586bd54a62b2403d6709a77a4494420a7b825cd807352149b8eca4a41ed43bacd3b50d80d1ad206ab4
-  data.tar.gz: 794bba96d303eb4aae5380bf25dcaf1e561a5330209455ef1518a2e0eb8671792fced2034929fa95c6a472dc54c659cb1cd83240e9bf8c0d7a08864d3524f6b0
+  metadata.gz: ac4f364fa642af309078537e8ad370733668b03f34dbdb98d996d9e8314c5a58407aa75abce0e5bb24abf4ed90292e8f57f472290af52ca0796cdf865e95a3b2
+  data.tar.gz: 882b8fff9e41ad4bc147a52f589935801f914ab3d02d217df9fb7c5b1cf9235e5efa4c1c56779fd5dd06b01d79f8924db3ff109c7e9474d4a469334697d43e23

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

@@ -19,7 +19,8 @@ module Watir
     def dom_changed?(delay: 1.1)
       element_call do
         begin
-          driver.manage.timeouts.script_timeout = delay + 1
+          script_timeout = driver.manage.timeouts.script_timeout
+          driver.manage.timeouts.script_timeout = delay + Watir::DOM::Wait.minimum_script_timeout
           driver.execute_async_script(DOM_WAIT_JS, wd, delay)
         rescue Selenium::WebDriver::Error::JavascriptError => error
           # sometimes we start script execution before new page is loaded and
@@ -27,9 +28,7 @@ module Watir
           retry if error.message.include?('document unloaded while waiting for result')
           raise
         ensure
-          # TODO: make sure we rollback to user-defined timeout
-          # blocked by https://github.com/seleniumhq/selenium-google-code-issue-archive/issues/6608
-          driver.manage.timeouts.script_timeout = 1
+          driver.manage.timeouts.script_timeout = script_timeout
         end
       end
     end

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

@@ -16,7 +16,7 @@ var exitOnNotStartedModifying = function() {
   return setTimeout(function() {
     observer.disconnect();
     callback(true);
-  }, 1000);
+  }, delay);
 }
 // arguments from WebDriver

data/lib/watir-dom-wait.rb CHANGED Viewed

@@ -1,2 +1,16 @@
 require 'watir'
 require 'watir/dom/elements/element'
+module Watir
+  module DOM
+    module Wait
+      class << self
+        attr_writer :minimum_script_timeout
+        def minimum_script_timeout
+          @minimum_script_timeout ||= 2
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb CHANGED Viewed

@@ -4,7 +4,11 @@ RSpec.configure do |spec|
   spec.filter_run_excluding bug: /\d+/
   spec.before(:all) do
-    Selenium::WebDriver::Chrome.path = "#{File.dirname(__FILE__)}/../bin/google-chrome" if ENV['TRAVIS']
+    opts = {}
+    if ENV['TRAVIS']
+      Selenium::WebDriver::Chrome.path = "#{File.dirname(__FILE__)}/../bin/google-chrome"
+      opts[:args] = ['no-sandbox']
+    end
     @browser = Watir::Browser.new(:chrome, opts)
     @browser.goto "data:text/html,#{File.read('spec/support/html/wait_for_dom.html')}"
   end

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

@@ -1,31 +1,36 @@
 require 'spec_helper'
 describe Watir::Element do
-  describe "#when_dom_changed" do
+  describe "#dom_changed?" do
     context "when DOM is changed" do
-      context "when block is not given" do
-        it "waits using mutation observer" do
-          @browser.button(id: "quick").click
-          expect(@browser.div.wait_until(&:dom_changed?).spans.count).to eq(20)
-        end
+      it "waits using mutation observer" do
+        @browser.button(id: "quick").click
+        expect(@browser.div.wait_until(&:dom_changed?).spans.count).to eq(20)
+      end
-        it "waits using custom interval" do
-          @browser.button(id: "long").click
-          expect(@browser.div.wait_until(&:dom_changed?).spans.count).to eq(5)
-        end
+      it "waits using custom interval" do
+        @browser.button(id: "long").click
+        expect(@browser.div.wait_until(&:dom_changed?).spans.count).to eq(5)
+      end
-        it "raises timeout error" do
-          @browser.button(id: "quick").click
-          expect { @browser.div.wait_until(timeout: 1, &:dom_changed?) }.to raise_error(Watir::Wait::TimeoutError)
-        end
+      it "raises timeout error" do
+        @browser.button(id: "quick").click
+        expect { @browser.div.wait_until(timeout: 1, &:dom_changed?) }.to raise_error(Watir::Wait::TimeoutError)
+      end
+      it "resets script_timeout" do
+        @browser.driver.manage.timeouts.script_timeout = 7
+        @browser.button(id: "quick").click
+        @browser.div.wait_until(&:dom_changed?)
+        expect(@browser.driver.manage.timeouts.script_timeout).to eq(7)
+      end
-        context "when run more than one time" do
-          it "waits for DOM consecutively" do
-            3.times do |i|
-              sleep 1
-              @browser.button(id: "quick").click
-              expect(@browser.div.wait_until(&:dom_changed?).spans.count).to eq(20 * (i + 1))
-            end
+      context "when run more than one time" do
+        it "waits for DOM consecutively" do
+          3.times do |i|
+            sleep 1
+            @browser.button(id: "quick").click
+            expect(@browser.div.wait_until(&:dom_changed?).spans.count).to eq(20 * (i + 1))
           end
         end
       end

data/watir-dom-wait.gemspec CHANGED Viewed

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 Gem::Specification.new do |spec|
   spec.name          = "watir-dom-wait"
-  spec.version       = "0.3.3"
+  spec.version       = "0.4.0"
   spec.authors       = ["Alex Rodionov"]
   spec.email         = %w(p0deje@gmail.com)
   spec.description   = "Watir extension which provides with method to check for DOM changes."
@@ -16,9 +16,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-  spec.add_dependency "watir", ">= 6.4"
+  spec.add_dependency "watir", ">= 7.0"
-  spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir-dom-wait
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Alex Rodionov
-autorequire:
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2022-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.4'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.4'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -91,7 +77,7 @@ homepage: https://github.com/p0deje/watir-dom-wait
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -106,9 +92,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.11
-signing_key:
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Watir extension which provides with method to check for DOM changes.
 test_files: