appom 1.2.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35d79b86da3958d465691aa8f67adff728310412cfe8f898ec1f00b16efc0102
-  data.tar.gz: 3bea92052029e696b96c86bdacbdddaeaca1972fced1bb0e27592d0d13e1ca46
+  metadata.gz: 2f34beb277b19dd56062d095dfc710b587ba210334fbaddca1ca278f1944a34a
+  data.tar.gz: 6d72a01178c225dec28c1320ac1aeb937b78f6b577d39c439f9645a364d8d3fd
 SHA512:
-  metadata.gz: 9dfdae46709e5bc0657ae10c92010e2979ad8285673545b662fb04402b0dae1fa4a360b4755b05e5da303a66b9796e66be6b2cf113df4af05241b32cb8f2915c
-  data.tar.gz: d49e352631b8cd97fb50b5ba7bd5e712eb63cb23e01cdefb1125802382f79b200c590a042c5a511da794bd2b191ce010c27257a9207322c79ad93cafe2c1a578
+  metadata.gz: 2313c1979765e4af47c8b453183cd30507e0f2309879234c233f2f3671df2fbd82bb66d47c3c21721dfe903a4f96af7af9e4619598de7cfca505c9ece75077af
+  data.tar.gz: fd4da56697db614455a4c1334d3ec097bc229a97be03e006853aa2239300ab631f7d6ffaaed8f1a4249f17f391db2421d17005a974c876599744c0b3e6357bf2

data/lib/appom/element_finder.rb

@@ -8,11 +8,6 @@ module Appom
       wait.until do
         elements = page.find_elements(*args)
         elements.each do |element|
-          # No need to check. Just return first element
-          if visible.nil? && text.nil?
-            return element
-          end
-
           if !visible.nil? && !text.nil?
             if element.displayed? && element.text == text
               return element
@@ -25,22 +20,67 @@ module Appom
             if element.text == text
               return element
             end
+          # Just return first element
+          else
+            return element
           end
         end
-        raise Appom::ElementsEmptyError, "Not found element with text #{text}"
+        raise Appom::ElementsEmptyError, "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 elment with find_args
+    # 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)
-      elements = page.find_elements(*find_args)
-      return elements.empty? ? false : true
+      elements = page.find_elements(*args)
+
+      if visible.nil? && text.nil? 
+        return elements.empty? ? false : true
+      else
+        is_found = false
+        elements.each do |element|
+          if !visible.nil? && !text.nil?
+            if element.displayed? && element.text == text
+              is_found = true
+            end
+          elsif !visible.nil?
+            if element.displayed?
+              is_found = true
+            end
+          elsif !text.nil?
+            if element.text == text
+              is_found = true
+            end
+          end
+        end
+        return is_found
+      end
     end
 
     ##
@@ -53,7 +93,7 @@ module Appom
         result = page.find_elements(*find_args)
         # If reponse is empty we will return false to make it not pass Wait condition
         if result.empty?
-          raise Appom::ElementsEmptyError, "Array is empty"
+          raise Appom::ElementsEmptyError, "Can not found any elements with args = #{find_args}"
         end
         # Return result
         return result
@@ -68,16 +108,16 @@ module Appom
         case type
         # Function only return true if element enabled or raise an error if time out
         when 'element enable'
-          page.find_element(*find_args).enabled?
+          _find(*find_args).enabled?
         # Function only return true if element disabled or raise an error if time out
         when 'element disable'
-          !page.find_element(*find_args).enabled?
+          !_find(*find_args).enabled?
         # Function only return true if we can find at leat one element (array is not empty) or raise error
         when 'at least one element exists'
-          !page.find_elements(*find_args).empty?
+          !_all(*find_args).empty?
         # Function only return true if we can't find at leat one element (array is empty) or raise error
         when 'no element exists'
-          page.find_elements(*find_args).empty?
+          _all(*find_args).empty?
         end
       end
     end

data/lib/appom/version.rb

@@ -1,3 +1,3 @@
 module Appom
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.3.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appom
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Harry.Tran
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2021-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appium_lib
@@ -74,7 +74,7 @@ homepage: https://github.com/hoangtaiki/appom
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -89,9 +89,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
-signing_key: 
+rubygems_version: 3.2.19
+signing_key:
 specification_version: 4
 summary: A Page Object Model for Appium
 test_files: []