gridium 1.1.13 → 1.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acd1b2c1b0d1f4e0f4e5990735247e7cdac1cb20
-  data.tar.gz: 9009bf8fc720f0042065e4ffad60e48533c56b8a
+  metadata.gz: fb7127799f6a1c83d18a5a139f7b84f9d54f7844
+  data.tar.gz: 9af4c6ec7a7ebd639158cd076cb9f7d55326abff
 SHA512:
-  metadata.gz: 30fc0a6d19199d5175527b402315665b6fce86c3cd957d139c44b8e3f8a4b249cebf4eea89590b6895f82ecd1963391bd3e0b8a4f0f1a4bdc7d967d1caf2640c
-  data.tar.gz: 965bf7126e8e29131c66c402d555f26d5b6cdb8e39d73c55f75140c8cbe5a794971790f6d2cac64d1230403ebc61ecb4abae7f503d4558754f826984fe2e3918
+  metadata.gz: 20f987944c09a29fa4ce3d58feb17c2415a4bcf3d0fee50b3823ab4f06c3b8b084033b68be4215779089e4822de734dc968bf98ed88db8a0d1dab9f2fc0c2b6e
+  data.tar.gz: 0f3de5442e613dfb7955f4562b10ffa9fc22bb0745aa978998674f4df4a387fd8cbf6402f6615e2d5ce3dd2b0325f36fcfb63de7ffdb921acde08e47ae36f1b2

data/lib/element.rb

@@ -23,6 +23,8 @@ class Element
 
     #how long to wait between clearing an input and sending keys to it
     @text_padding_time = 0.15
+
+    @default_timeout = Gridium.config.element_timeout
   end
 
   def to_s
@@ -30,7 +32,7 @@ class Element
   end
 
   def element(opts = {})
-    timeout = opts[:timeout].nil? ? Gridium.config.element_timeout : opts[:timeout]
+    timeout = opts[:timeout].nil? ? @default_timeout : opts[:timeout]
 
     if stale?
       wait = Selenium::WebDriver::Wait.new :timeout => timeout, :interval => 1

data/lib/page.rb

@@ -48,17 +48,23 @@ module Gridium
       end
     end
 
-    def self.has_text?(text)
-      has_flash?(text)
+
+    def self.has_text?(text, opts = {})
+      has_flash?(text, opts)
     end
 
-    def self.has_flash?(text)
-      wait = Selenium::WebDriver::Wait.new(:timeout => 5) #5 seconds every 500ms
+    def self.has_flash?(text, opts = {})
+      timeout = opts[:timeout] || 5
+      wait = Selenium::WebDriver::Wait.new(:timeout => timeout)
       begin
-        element = wait.until {Driver.html.include? text}
+        if opts[:visible]
+          element = wait.until { Element.new("Finding text '#{text}'", :xpath, "//*[text()='#{text}']").displayed? }
+        else
+          element = wait.until { Driver.html.include? text }
+        end
       rescue Exception => exception
-        Log.debug("[GRIDIUM::Page] has_flash? exception was rescued: #{exception}")
-        Log.warn("[GRIDIUM::Page] Could not find the flash message!")
+        Log.debug("[GRIDIUM::Page] exception was rescued: #{exception}")
+        Log.warn("[GRIDIUM::Page] Could not find the text '#{text}'!")
       end
 
       if element
@@ -122,7 +128,7 @@ module Gridium
     end
 
     def click_on(text)
-      Element.new("Clicking #{text}", :xpath, "//*[text()='#{text}')]").click
+      Element.new("Clicking #{text}", :xpath, "//*[text()='#{text}']").click
     end
 
     # Click the link on the page

metadata

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