appom 1.2.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e601fd52165d14faf9034b72ff67ffa96debfc5cbdf4613b7c316ed8141fbf2d
-  data.tar.gz: 6d66f8805aa55fc163f93bc08194711fa6e7858c7835eda3eeeff39fe02d9761
+  metadata.gz: b1030494ef95f2af0c9678aa7c220bff5d2f0f310cb639ec3dc136c23f41a2f4
+  data.tar.gz: c3df4e124bb187d84dac2d85fb007eb1ace54d91e9506dbe6dd4d9912c4724e8
 SHA512:
-  metadata.gz: 5df8393fe36883906a7f60980f8eff1faf89d9013708d91bed32b2fba1da19a3566e6c8c316ead100eca40b850e9c8890049c7ecb05d5228d4861094fd5a97bd
-  data.tar.gz: 66247fd2603d1250c168f0c8eeb634cd40d0e7178f6e37a825ec06a965ed07bcbd68b5eeb9f35ba3ee72eff4a7a8e14de7a21b6916db9e378b7f64290b4fa66b
+  metadata.gz: 02e04c8efb1b8fa47bd74e678608cc90ca3f3c0127f34ddd4a271d9b2818e0f2ef8a944c619cbef2c33cab9d2c897d443fb4922bd3f33f8d7ab57995dec09e32
+  data.tar.gz: 713fe96ad8cd58e15c3b13d37c3e872024b72685a02fac54d61065d3fc82bf9f22e61a610046388d9dd6e526d2a4e005ba75ff4d66908805ec4ac3317abdf61d

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 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
@@ -74,12 +114,10 @@ module Appom
           !_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'
-          args, text, visible = deduce_element_args(find_args)
-          !page.find_elements(*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'
-          args, text, visible = deduce_element_args(find_args)
-          page.find_elements(*args).empty?
+          _all(*find_args).empty?
         end
       end
     end

data/lib/appom/version.rb

@@ -1,3 +1,3 @@
 module Appom
-  VERSION = '1.2.1'.freeze
+  VERSION = '1.3.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appom
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Harry.Tran
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-11 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: []