lib/element.rb in gridium-0.1.20 vs lib/element.rb in gridium-0.1.21

@@ -21,11 +21,11 @@
   def to_s
     "'#{@name}' (By:#{@by} => '#{@locator}')"
   end
 
   def element
-    if @element.nil? or is_stale?
+    if stale?
       wait = Selenium::WebDriver::Wait.new :timeout => Gridium.config.element_timeout, :interval => 1
       if Gridium.config.visible_elements_only
         wait.until { @element = displayed_element }
       else
         wait.until { @element = @driver.find_element(@by, @locator); Log.debug("Finding element #{self}..."); @element.enabled? }
@@ -47,11 +47,11 @@
       elements.each do |element|
         if element.displayed? #removed check for element.enabled
           found_element = element; #this will always return the last displayed element
         end
       end
-    rescue Exception => e
+    rescue StandardError
       if found_element
         Log.warn("An element was found, but it was not displayed on the page. Gridium.config.visible_elements_only set to: #{Gridium.config.visible_elements_only} Element: #{self.to_s}")
       else
         Log.warn("Could not find Element: #{self.to_s}")
       end
@@ -63,41 +63,37 @@
   # ================ #
   # Element Commands #
   # ================ #
 
   # soft failure, will not kill test immediately
-  def verify(timeout=nil)
+  def verify(timeout: nil)
     Log.debug('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: nil)
     Log.debug('Waiting for new element...')
     timeout = Gridium.config.element_timeout if timeout.nil?
-    ElementVerification.new(self, timeout, fail_test=true)
+    ElementVerification.new(self, timeout, fail_test: true)
   end
 
   def attribute(name)
     element.attribute(name)
   end
 
   def present?
-    begin
-      return element.enabled?
-    rescue Exception => e
-      return false
-    end
+    return element.enabled?
+  rescue StandardError
+    return false
   end
 
   def displayed?
-    begin
-      return element.displayed?
-    rescue Exception => e
-      return false
-    end
+    return element.displayed?
+  rescue StandardError
+    return false
   end
 
   def enabled?
     element.enabled?
   end
@@ -120,11 +116,11 @@
   def send_keys(*args)
     Log.debug("Typing: #{args} into element: (#{self}).")
     if element.enabled?
       ElementExtensions.highlight(self) if Gridium.config.highlight_verifications
       $verification_passes += 1
-      element.send_keys *args
+      element.send_keys(*args)
     else
       Log.error('Cannot type into element.  Element is not present.')
     end
   end
 
@@ -292,16 +288,13 @@
     end
   end
 
   private
 
-  def is_stale?
-    begin
-      if @element.enabled?
-        return false
-      end
-    rescue Exception => e
-      Log.warn("Stale element detected.... #{self.to_s}")
-      return true
-    end
+  def stale?
+    return true if @element.nil?
+    @element.disabled?
+  rescue StandardError
+    Log.warn("Stale element detected.... #{self.to_s}")
+    return true
   end
-end
\ No newline at end of file
+end