watir_drops 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 280730b6901eb01a5744bc02c17e50c0d14fce76
-  data.tar.gz: deb0cd398b6c840f35346c37d110a70eff7de0f3
+  metadata.gz: 171e38eba96f09a57de7f7f73916693ad11cb93e
+  data.tar.gz: 0f6423ac9a41c06557839fe334e796f3ffd0e532
 SHA512:
-  metadata.gz: b5f878a47b275c0bd4c4865045cd30f7b0d32464105af3a11914f5c010d79b91211e5cc402f538e3d443c2068359249e03e0d1248ac4dc561b73f181a9a4e14a
-  data.tar.gz: d5e0bfd51542d40f8d6befc46e944a5ef762e5651d0f3134d2e3cc3d0e25ac8fe39ac6e0de09e55c3c17330c56fd7e032f80cc5bca76a0d712d8575f594f31f4
+  metadata.gz: 8b277848895d85656e8e400ae1e3edce263f55e028acc46d837cc5a9a538816aa8e4427403061fb31ec9387cd322a27691cd7b9cceb71aa9599571b218b2e9f8
+  data.tar.gz: cc7bf3e2b873a2a74a87c53ca5342c8917235401fd79e21651ee75c4c056fda9d124a2898914913f7510f2eb0d61e660c9004275b2d704d7bf70ca8975b5e23a

data/CHANGES.md

@@ -1,3 +1,7 @@
+### 0.7.1 (2017-05-19)
+
+* `#on_page?` evaluates immediately
+
 ### 0.7.0 (2017-02-02)
 
 * implement #on_page? verification by url, title or element(s) (thanks Lu Cui)

data/lib/watir_drops/page_object.rb

@@ -15,13 +15,8 @@ module WatirDrops
         define_method("page_url") do |*args|
           yield(*args)
         end
-
-        define_method("goto") do |*args|
-          browser.goto page_url(*args)
-        end
       end
 
-
       def page_title
         define_method("page_title") do |*args|
           yield(*args)
@@ -80,11 +75,16 @@ module WatirDrops
           page.goto(*args)
           exception = Selenium::WebDriver::Error::WebDriverError
           message = "Expected to be on #{page.class}, but conditions not met"
-          raise exception, message if page.page_verifiable? && !page.on_page?
+          if page.page_verifiable?
+            begin
+              page.wait_until(&:on_page?)
+            rescue Watir::Wait::TimeoutError
+              raise exception, message
+            end
+          end
         end
       end
 
-
       def browser=(browser_input)
         @@browser = browser_input
       end
@@ -127,25 +127,27 @@ module WatirDrops
       message = "Can not verify page without any requirements set"
       raise exception, message unless page_verifiable?
 
-      @browser.wait_until do |browser|
-        !self.class.require_url || page_url.gsub("#{URI.parse(page_url).scheme}://", '') == browser.url.gsub("#{URI.parse(browser.url).scheme}://", '')
+      if self.class.require_url && page_url.gsub("#{URI.parse(page_url).scheme}://", '') != browser.url.gsub("#{URI.parse(browser.url).scheme}://", '')
+        return false
       end
 
-      @browser.wait_until do |browser|
-        !self.respond_to?(:page_title) || browser.title == page_title
+      if self.respond_to?(:page_title) && browser.title != page_title
+        return false
       end
 
-      @browser.wait_until do |_browser|
-        !self.class.required_element_list.any? || self.class.required_element_list.all? { |e| send(e).present? }
+      if !self.class.required_element_list.empty? && self.class.required_element_list.any? { |e| !send(e).present? }
+        return false
       end
 
       true
-    rescue Watir::Wait::TimeoutError
-      false
+    end
+
+    def goto(*args)
+      browser.goto page_url(*args)
     end
 
     def method_missing(method, *args, &block)
-      if @browser.respond_to?(method)
+      if @browser.respond_to?(method) && method != :page_url
         @browser.send(method, *args, &block)
       else
         super

data/watir_drops.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'watir_drops'
-  spec.version       = '0.7.0'
+  spec.version       = '0.7.1'
   spec.authors       = ['Titus Fortner']
   spec.email         = ['titusfortner@gmail.com']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir_drops
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir