watir 6.8.1 → 6.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bab202c139eec8a6f1588038a05b0a6c1fb1967
-  data.tar.gz: b5b9856ff71421e43bfbc31b982260cafbb759b7
+  metadata.gz: 727cd5c1020e932467833d4750dc61716f60b8fb
+  data.tar.gz: b0e81b12faace42be3914ef54de2b1d25fddb4cb
 SHA512:
-  metadata.gz: df12527b5f19fdb984ae4c9a2aa7d92ec354c8f366b2e42434d260dfd677274a15d1675bdfb0fe53558e5b719e69fb545dad2bbbcb367f0dc83f587343aac00a
-  data.tar.gz: b581ed689210455fcaf52cb8b1cb2f50eb120e816cc08de4bea703a6cb4ee5f6d057ceaf9790e143e67f05df545f9c9f429aba5d420a19241d4d8d8570fdfc60
+  metadata.gz: 4ba07e681cc33793a02bd6a1deff4419bdff895374d7329bb3c55a6c83e820bc9456b56fc4d80ffc2dc9079760615311119b90e5ef76e774f6b85ffc0a506f38
+  data.tar.gz: bee368388abe7453cd081bfd55c7f8e9e2417016230a373b3451ea89b48ac49b2ce9ce4e6015ebf8a9540dccf96c484e3a5eb1da741f0c8c0d5a39316d91adfc

data/CHANGES.md

@@ -1,3 +1,8 @@
+### 6.8.2 (2017-09-06)
+
+* Fix bug to prevent after_hooks from running when an alert is present
+* Fix bug with actions not correctly timing out (#636)
+
 ### 6.8.1 (2017-09-05)
 
 * Ignore index locator when value is zero

data/lib/watir/after_hooks.rb

@@ -66,7 +66,7 @@ module Watir
     #
 
     def run
-      if @after_hooks.any? && @browser.window.present?
+      if @after_hooks.any? && @browser.window.present? && !@browser.alert.exists?
         each { |after_hook| after_hook.call(@browser) }
       end
     end

data/lib/watir/wait/timer.rb

@@ -2,8 +2,6 @@ module Watir
   module Wait
     class Timer
 
-      attr_reader :remaining_time
-
       def initialize(timeout: nil)
         @end_time = current_time + timeout if timeout
         @remaining_time = @end_time - current_time if @end_time
@@ -25,6 +23,10 @@ module Watir
         end
       end
 
+      def remaining_time
+        @end_time - current_time
+      end
+
       def reset!
         @end_time = nil
       end

data/spec/watirspec/after_hooks_spec.rb

@@ -125,21 +125,17 @@ describe "Browser::AfterHooks" do
     end
 
     not_compliant_on :safari, :headless do
-      it "raises UnhandledAlertError error when running error checks with alert present" do
-        url = WatirSpec.url_for("alerts.html")
-        @page_after_hook = Proc.new { browser.url }
-        browser.after_hooks.add @page_after_hook
-        browser.goto url
+      it "does not run error checks with alert present" do
+        browser.goto WatirSpec.url_for("alerts.html")
 
-        not_compliant_on :firefox do
-          expect { browser.button(id: "alert").click }.to raise_error(Selenium::WebDriver::Error::UnhandledAlertError)
-        end
+        @page_after_hook = Proc.new { @yield = browser.title == "Alerts" }
+        browser.after_hooks.add @page_after_hook
 
-        deviates_on :firefox do
-          expect { browser.button(id: "alert").click }.to raise_error(Selenium::WebDriver::Error::UnexpectedAlertOpenError)
-        end
+        browser.button(id: "alert").click
+        expect(@yield).to be_nil
 
         browser.alert.ok
+        expect(@yield).to eq true
       end
     end
 

data/spec/watirspec/wait_spec.rb

@@ -144,6 +144,23 @@ describe Watir::Element do
     end
   end
 
+  compliant_on :relaxed_locate do
+    it "clicking automatically waits until the element appears" do
+      browser.a(id: 'show_bar').click
+      expect { browser.div(id: 'bar').click }.to_not raise_exception
+      expect(browser.div(id: 'bar').text).to eq 'changed'
+    end
+
+    it "raises exception if the element doesn't appear" do
+      expect { browser.div(id: 'bar').click }.to raise_unknown_object_exception
+    end
+
+    it "raises exception if the element doesn't become enabled" do
+      expect { browser.button(id: 'btn').click }.to raise_object_disabled_exception
+    end
+
+  end
+
   not_compliant_on :relaxed_locate do
     describe "#wait_until &:enabled?" do
       it "invokes subsequent method calls when the element becomes enabled" do

data/watir.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'watir'
-  s.version     = '6.8.1'
+  s.version     = '6.8.2'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Alex Rodionov', 'Titus Fortner']
   s.email       = ['p0deje@gmail.com', 'titusfortner@gmail.com']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir
 version: !ruby/object:Gem::Version
-  version: 6.8.1
+  version: 6.8.2
 platform: ruby
 authors:
 - Alex Rodionov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-05 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver