appom 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75497e842dc00bf929ffd3752fdc74c3dfb34094c8f74b360e51c137e654f93d
-  data.tar.gz: bf5f95feb5aaf74bc1ee39f7a9592c9d6f3b63b3a60d5225777f8f5f506ee806
+  metadata.gz: e9a6de43f053bda132bbb8858033c9321366faf11ecc1a2f00f4182cb84c49ee
+  data.tar.gz: ebd235ad562a8277b0bf5b6875da253e5f6f5ba804265f102115c0bf55b9c304
 SHA512:
-  metadata.gz: '09ea6e4f15eaadcad9627066bad3c51f228882a59b36470a1ff4fc5360b525220bf1f7769bebf019b827ac5c1d6632015695a98c63f19581a5059d3d77bc4a0b'
-  data.tar.gz: 8b135b65504c6212668ef6d3a6be1f4dd819e44bb11c14a166f4ab229202603ca50e4e4d9d795418b8f6b6c673f0b7be800f7e8304eaa3e2fe99c6b66bdcaa6d
+  metadata.gz: a82fc453c96e887cecca965b5a470aef664ef10cb005d89b50d29dda56be3bd30a1c8b133473086c4bdd71a46834c5324aa6846fa1b010f2509d622f71b7e320
+  data.tar.gz: 5c20db78987ad7edf20eeccf52c5361ff0ba23cd9f57d038cab7e70161304887503a85de391a0fefd1b6e2dc9a1cac01ec5c470526d01dcf2984c6c4dce1511e

data/lib/appom.rb

@@ -9,17 +9,6 @@ module Appom
   class InvalidElementError < StandardError; end
   # A block was passed to the method, which it cannot interpreter.
   class UnsupportedBlockError < StandardError; end
-  # The condition that was being evaluated inside the block did not evaluate
-  # to true within the time limit.
-  class TimeoutError < StandardError; end
-  # An element could not be located on the page using the given search parameters.
-  class NoSuchElementError < StandardError; end
-  # An elements is empty using the given search parameters.
-  class ElementsEmptyError < StandardError; end
-  # Text from an element not equal expected text
-  class ElementsTextVerifyError < StandardError; end
-  # An element is define with no text value
-  class ElementsDefineNoTextError < StandardError; end
 
   autoload :ElementContainer, 'appom/element_container'
   autoload :Page, 'appom/page'

data/lib/appom/element_finder.rb

@@ -25,18 +25,40 @@ module Appom
             return element
           end
         end
-        raise Appom::ElementsEmptyError, "Can not found element with args = #{find_args}"
+        raise StandardError, "Can not found element with args = #{find_args}"
       end
     end
 
     # Find elements
     def _all(*find_args)
-      page.find_elements(*find_args)
+      args, text, visible = deduce_element_args(find_args)
+      elements = page.find_elements(*args)
+      els = []
+
+      elements.each do |element|
+        if !visible.nil? && !text.nil?
+          if element.displayed? && element.text == text
+            els.push(element)
+          end
+        elsif !visible.nil?
+          if element.displayed?
+            els.push(element)
+          end
+        elsif !text.nil?
+          if element.text == text
+            els.push(element)
+          end
+        else
+          els.push(element)
+        end
+      end
+      return els
     end
 
     # Check page has or has not element with find_args
     # If page has element return TRUE else return FALSE
     def _check_has_element(*find_args)
+      args, text, visible = deduce_element_args(find_args)
       elements = page.find_elements(*args)
 
       if visible.nil? && text.nil? 
@@ -70,9 +92,9 @@ module Appom
       wait = Wait.new(timeout: Appom.max_wait_time)
       wait.until do
         result = page.find_elements(*find_args)
-        # If reponse is empty we will return false to make it not pass Wait condition
+        # If response is empty we will return false to make it not pass Wait condition
         if result.empty?
-          raise Appom::ElementsEmptyError, "Can not found any elements with args = #{find_args}"
+          raise StandardError, "Can not found any elements with args = #{find_args}"
         end
         # Return result
         return result
@@ -90,15 +112,30 @@ module Appom
           _find(*find_args).enabled?
         # Function only return true if element disabled or raise an error if time out
         when 'element disable'
-          !_find(*find_args).enabled?
-        # Function only return true if we can find at leat one element (array is not empty) or raise error
+          result = _find(*find_args)
+          if result.enabled?
+            raise StandardError, "Still found an element enable with args = #{find_args}"
+          end
+          return true
+        # Function only return true if we can find at least one element (array is not empty) or raise error
         when 'at least one element exists'
-          args, text, visible = deduce_element_args(find_args)
-          !page.find_elements(*args).empty?
-        # Function only return true if we can't find at leat one element (array is empty) or raise error
+          result = _all(*find_args)
+          if result.empty?
+            raise StandardError, "Could not find any elements with args = #{find_args}"
+          end
+          return true
+
+        # Function only return true if we can't find at least one element (array is empty) or raise error
         when 'no element exists'
-          args, text, visible = deduce_element_args(find_args)
-          page.find_elements(*args).empty?
+          result = _all(*find_args)
+          if !result.empty?
+            if result.size > 1
+              raise StandardError, "Still found #{result.size} elements with args = #{find_args}"
+            else
+              raise StandardError, "Still found #{result.size} element with args = #{find_args}"
+            end
+          end
+          return true
         end
       end
     end

data/lib/appom/version.rb

@@ -1,3 +1,3 @@
 module Appom
-  VERSION = '1.3.0'.freeze
+  VERSION = '1.4.0'.freeze
 end

data/lib/appom/wait.rb

@@ -23,18 +23,20 @@ module Appom
     #
     def until
       end_time = Time.now + @timeout
+      error_message = ""
 
       until Time.now > end_time
         begin
           result = yield
           return result if result
-        rescue
+        rescue => error
+          error_message = error.message
         end
 
         sleep @interval
       end
 
-      raise Appom::TimeoutError, "Timed out after #{@timeout}s."
+      raise StandardError, error_message
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appom
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Harry.Tran
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-13 00:00:00.000000000 Z
+date: 2021-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appium_lib