pagetience 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 047639c7bb485cabfaede710c9398d3d9f469fcc
-  data.tar.gz: cf3130de096efde5b85cfb5776213a3b1160161d
+  metadata.gz: 5eac7b7a1c4e399056163e220d41dad6229c4d98
+  data.tar.gz: 642e76f08a4f94ada3105ceb28bddad504839497
 SHA512:
-  metadata.gz: 77dddb513326bd516ccb69b36fc101182afb900b105fe4eb9288dbc794e4528a3f4d6d13ce2461a3b050dbcea5de2b19b87cc46ce9336e30f707e3c97b85c5f9
-  data.tar.gz: b7fe6cfc8b03af4fa6f83769b6ecd0bd7c99bcf037dbed82f2ef85ca5e25845b4d1abbfa92aa1690f66638cbd27b62758826b7202ce8533b58ac3256ab917fd3
+  metadata.gz: 38f2d56062f34381671157714cb75984718b70c1de58f09a949ada684b7a7a09c16b445caa14033a8aae4d08fb5cbd2c21c027a37296853879dd0b83be0de47c
+  data.tar.gz: 41bed978caa6b10c4941671d6a56a4d71a0f6df27caa908d25828857fe33aad5444c24126339c80220dbcf6413032b9dbe14edb5c49224dd82111dd680f58201

data/lib/pagetience.rb

@@ -60,6 +60,8 @@ module Pagetience
     @_waiting_timeout = _waiting_timeout || Pagetience.config.timeout
     @_waiting_polling = _waiting_polling || Pagetience.config.polling
     @_required_elements = _required_elements || []
+    @_present_elements = []
+    @_missing_elements = []
     wait_for_required_elements
   end
 
@@ -71,13 +73,22 @@ module Pagetience
   # @param [Fixnum] timeout Time to wait in seconds
   # @param [Fixnum] polling How often to poll
   def wait_for_required_elements(timeout=nil, polling=nil)
-    opts = {
-        timeout: timeout,
-        polling: polling,
-        msg: "Timed out after polling every #{:polling}s for #{:timeout}s waiting for the page to be loaded."
-    }
+    msg = -> do
+      %{Timed out after polling every #{@_waiting_polling}s for #{@_waiting_timeout}s waiting for the page to be loaded.
+      Elements present: #{@_present_elements}
+      Elements missing: #{@_missing_elements}}
+    end
+
+    opts = { timeout: timeout, polling: polling, msg: msg }
     wait_for(opts) do
-      @loaded = true unless @_required_elements.any? { |e| !@element_platform.is_element_present? e }
+      @_missing_elements = []
+      @_required_elements.each do |e|
+        if !@element_platform.is_element_present?(e) && !@_missing_elements.include?(e)
+          @_missing_elements << e
+          @_present_elements = @_required_elements - @_missing_elements
+        end
+      end
+      @loaded = @_missing_elements.empty?
     end
   end
 

data/lib/pagetience/meditate.rb

@@ -29,6 +29,7 @@ module Pagetience
         @timeout = @timeout - @polling
       end
 
+      msg = msg.send(:call) if msg.is_a? Proc
       raise Pagetience::TimeoutError, msg unless @latest_result == expected
 
       @latest_result

data/lib/pagetience/version.rb

@@ -1,3 +1,3 @@
 module Pagetience
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagetience
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Derek McNeil
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler