gridium 1.1.10 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf5a9c8f3df0f9978e83575bad02a71c85ec17d7
-  data.tar.gz: 2fb3b033b7f5f295d6d3921c438c5a36c10146c0
+  metadata.gz: 21c60d0c86933dc7c134b4a1df4477e7383f7e4b
+  data.tar.gz: ac75c7b23af931d5922504a683a5d7b549ae6d31
 SHA512:
-  metadata.gz: ec1ce374dbf1796c28af13fdd05c37ad86ee525589f78ac1f7be8b44590d035723b0c8f5a3d75ba8d443d403e02c4262d231a5ce394eac5e9e125a4b834a60fe
-  data.tar.gz: c8da2b2a07d475805b867052a7bea04150da3f850258df9f1fef1f48856d8bfd68858e35eb04875f841663b328c33b5933dd8ec227944e6da71f77d1c59e3429
+  metadata.gz: e47b40b45770b778ba05e13a0fee50578cedc829172d66fb40f3bb03b3a6a6e719cd7215403bfb512392751960956e0b219dd63ba563140b108d574cd195ad59
+  data.tar.gz: 0e6d8a037c6fcfd25ec5c88a2b8237fde5be80bbbb05c54478d6f63dfc5a07f10a79f50d34af19e217f0add8d8d7c1b7b591100490da984becd9cf9a1515953f

data/bin/start

@@ -7,8 +7,7 @@ main(){
       docker exec $(docker-compose ps -q gridium) bundle install;
       ;;
     -d) #start in development mode
-      ${BUILD_NUMBER:=dev}
-      export BUILD_NUMBER
+      export BUILD_NUMBER=${BUILD_NUMBER:=dev}
       docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d
       docker exec $(docker-compose ps -q gridium) bundle install;
       ;;

data/lib/driver.rb

@@ -10,7 +10,7 @@ class Driver
     Log.debug("[Gridium::Driver] Driver.reset: #{@@driver}")
     driver.manage.delete_all_cookies
     driver.manage.timeouts.page_load = Gridium.config.page_load_timeout
-    driver.manage.timeouts.implicit_wait = Gridium.config.element_timeout
+    driver.manage.timeouts.implicit_wait = 0 # always use explicit waits!
 
     # Ensure the browser is maximized to maximize visibility of element
     # Ensure the browser is maximized to maximize visibility of element

data/lib/element.rb

@@ -29,9 +29,11 @@ class Element
     "'#{@name}' (By:#{@by} => '#{@locator}')"
   end
 
-  def element
+  def element(opts = {})
+    timeout = opts[:timeout].nil? ? Gridium.config.element_timeout : opts[:timeout]
+
     if stale?
-      wait = Selenium::WebDriver::Wait.new :timeout => Gridium.config.element_timeout, :interval => 1
+      wait = Selenium::WebDriver::Wait.new :timeout => timeout, :interval => 1
       if Gridium.config.visible_elements_only
         wait.until { @element = displayed_element }
       else
@@ -76,16 +78,14 @@ class Element
   # ================ #
 
   # soft failure, will not kill test immediately
-  def verify(timeout: nil)
+  def verify(timeout: Gridium.config.element_timeout)
     Log.debug('[GRIDIUM::Element] Verifying new element...')
-    timeout = Gridium.config.element_timeout if timeout.nil?
     ElementVerification.new(self, timeout)
   end
 
   # hard failure, will kill test immediately
-  def wait_until(timeout: nil)
+  def wait_until(timeout: Gridium.config.element_timeout)
     Log.debug('[GRIDIUM::Element] Waiting for new element...')
-    timeout = Gridium.config.element_timeout if timeout.nil?
     ElementVerification.new(self, timeout, fail_test: true)
   end
 
@@ -97,8 +97,6 @@ class Element
     element.css_value(name)
   end
 
-
-
   def present?
     return element.enabled?
   rescue StandardError => error
@@ -258,7 +256,7 @@ class Element
     else
       Log.error('[GRIDIUM::Element] Cannot jquery_click.  Element is not present.')
     end
-  end  
+  end
 
   def size
     element.size

data/lib/element_verification.rb

@@ -29,10 +29,10 @@ class Gridium::ElementVerification
     end
 
     if should_have_text
-      fail_message = "Element should contain text (#{text}), but does not."
+      fail_message = "Element should contain text (#{text}), but does not. timed out after #{@timeout} seconds"
       pass_message = "contains text (#{text})."
     else
-      fail_message = "Element should not contain text (#{text}), but does."
+      fail_message = "Element should not contain text (#{text}), but does. timed out after #{@timeout} seconds"
       pass_message = "does not contain text (#{text}).  Actual text is: (#{element_text})."
     end
 
@@ -49,6 +49,7 @@ class Gridium::ElementVerification
           ElementExtensions.highlight(@element) if Gridium.config.highlight_verifications
           log_success(pass_message)
         else
+          # TODO: @rizzza: This `.not` case is wrong. It bails too early and does not evaluate with the wait block
           log_issue("#{fail_message}  Element's text is: (#{element_text}).")
         end
       end
@@ -62,17 +63,17 @@ class Gridium::ElementVerification
     should_be_visible = @should_exist
 
     if should_be_visible
-      fail_message = "Element should be visible."
+      fail_message = "Element should be visible. timed out after #{@timeout} seconds"
       pass_message = "Element is visible."
     else
-      fail_message = "Element should not be visible."
+      fail_message = "Element should not be visible. timed out after #{@timeout} seconds"
       pass_message = "Element is not visible."
     end
 
     wait = Selenium::WebDriver::Wait.new :timeout => @timeout, :interval => 1
     begin
       wait.until do
-        element_is_displayed = @element.displayed?
+        element_is_displayed = @element.element(timeout: @timeout).displayed?
         if element_is_displayed && should_be_visible
           ElementExtensions.highlight(@element) if Gridium.config.highlight_verifications
           log_success(pass_message)
@@ -81,6 +82,7 @@ class Gridium::ElementVerification
           Log.debug("[GRIDIUM::ElementVerification] Confirming element is NOT visible...")
           log_success(pass_message)
         else
+          # TODO: @rizzza: This `.not` case is wrong. It bails too early and does not evaluate with the wait block
           log_issue(fail_message)
         end
       end
@@ -94,17 +96,17 @@ class Gridium::ElementVerification
     should_be_present = @should_exist
 
     if should_be_present
-      fail_message = "Element should be present."
+      fail_message = "Element should be present. timed out after #{@timeout} seconds"
       pass_message = "is present."
     else
-      fail_message = "Element should NOT be present."
+      fail_message = "Element should NOT be present. timed out after #{@timeout} seconds"
       pass_message = "is not present."
     end
 
     wait = Selenium::WebDriver::Wait.new :timeout => @timeout, :interval => 1
     begin
       wait.until do
-        element_is_present = @element.present?
+        element_is_present = @element.element(timeout: @timeout).present?
         if element_is_present && should_be_present
           ElementExtensions.highlight(@element) if Gridium.config.highlight_verifications
           log_success(pass_message)
@@ -113,6 +115,7 @@ class Gridium::ElementVerification
           Log.debug("[GRIDIUM::ElementVerification] Confirming element is NOT present...")
           log_success(pass_message)
         else
+          # TODO: @rizzza: This `.not` case is wrong. It bails too early and does not evaluate with the wait block
           log_issue(fail_message)
         end
       end
@@ -147,7 +150,7 @@ class Gridium::ElementVerification
     if @fail_test
       Log.error("[GRIDIUM::ElementVerification] #{message} ['#{@element.name}' (By:(#{@element.by} => '#{@element.locator}'))].")
       $fail_test_instantly = true
-      Kernel.fail(message)
+      raise Selenium::WebDriver::Error::TimeOutError, message
     else
       Log.error("[GRIDIUM::ElementVerification] #{message} ['#{@element.name}' (By:(#{@element.by} => '#{@element.locator}'))].")
       $fail_test_at_end = true

data/lib/page.rb

@@ -89,6 +89,8 @@ module Gridium
       Timeout.timeout(Gridium.config.page_load_timeout) do
         loop until jquery_loaded?
       end
+    rescue Timeout::Error => e
+      Log.warn("[GRIDIUM::Page] Timed-out waiting for ajax")
     end
 
     def self.jquery_loaded?
@@ -98,9 +100,9 @@ module Gridium
     #
     # JQuery click
     # @param [String] CSS selector
-    # 
-    # Occasionaly selenium is unable to click on elements in the DOM which have some 
-    # interesting React goodies around the element. 
+    #
+    # Occasionaly selenium is unable to click on elements in the DOM which have some
+    # interesting React goodies around the element.
     #
     def self.jquery_click(selector)
       Driver.evaluate_script("$(\"#{selector}\").click().change();")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gridium
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.11
 platform: ruby
 authors:
 - Seth Urban
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler