appom 1.2.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f484560756312f1f488680c7dac395f8a811c38d01f691fcb3259ea905c4bd6
-  data.tar.gz: 9e282e64e0afdaf5c38d7e91d5304ee5136543039bc30df66761ff8281079751
+  metadata.gz: 9b7303f11e73610c1a3303bfe2ba1d502ffece2ad2b26e18cbc47889318d25a8
+  data.tar.gz: 3ab20f9d02933108b3d7556bae7c0409ce527d0cb8baf9ce7d007204e23e9b13
 SHA512:
-  metadata.gz: c39d03e79e31c983eda9dca7d4bafcf00994b2f60783f3d1723f108d89e9eb965bbd5d8aa197e394c4a60c0201a325e16ec700487a82ef34441ae401703de734
-  data.tar.gz: dc9c89c08d924e9e9d932f29598c42c3a852845c62083fd65b582d3007160993c6c163bffcbf1d8ac234db7cabe90537e2c7334a475068df060bc1952aecb80f
+  metadata.gz: f9d8e7c83ec95a20297b2f5c2d884ff630fdace446996b5eadbc25a00352828156262ca275745789a78aea6ef9194550e6b46c49c0a989efcdc20b2cec6b7dae
+  data.tar.gz: 0fb77d98ae662ccf901f8e3ab2121137b441c7c34c63bd8242ffda9eef3804cdcf84daa3df518d01ea2a8f4fb508fb0164a7c6d9783ae9095c801c28ea15fd68

data/lib/appom/cucumber.rb

@@ -2,6 +2,5 @@
 
 # We will start driver before each scenario
 Before do
-  puts "---------Start Appom --------1"
   Appom.start_driver
 end

data/lib/appom/element_finder.rb

@@ -5,41 +5,83 @@ module Appom
       args, text, visible = deduce_element_args(find_args)
       wait = Wait.new(timeout: Appom.max_wait_time)
 
-      if visible.nil? && text.nil?
-        wait.until { page.find_element(*find_args) }
-      else
-        wait.until do
-          elements = page.find_elements(*args)
-          elements.each do |element|
-            if !visible.nil? && !text.nil?
-              if element.displayed? && element.text == text
-                return element
-              end
-            elsif !visible.nil?
-              if element.displayed?
-                return element
-              end
-            elsif !text.nil?
-              if element.text == text
-                return element
-              end
+      wait.until do
+        elements = page.find_elements(*args)
+        elements.each do |element|
+          if !visible.nil? && !text.nil?
+            if element.displayed? && element.text == text
+              return element
+            end
+          elsif !visible.nil?
+            if element.displayed?
+              return element
             end
+          elsif !text.nil?
+            if element.text == text
+              return element
+            end
+          # Just return first element
+          else
+            return element
           end
-          raise Appom::ElementsEmptyError, "Not found element with text #{text}"
         end
+        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
+      args, text, visible = deduce_element_args(find_args)
+      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
 
     ##
@@ -52,7 +94,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
@@ -63,113 +105,21 @@ module Appom
     # Note: Function WILL NOT RETURN ELEMENT
     def wait_until(type, *find_args)
       wait = Wait.new(timeout: Appom.max_wait_time)
-      args, text, visible = deduce_element_args(find_args)
-
-      if visible.nil? && text.nil?
-        wait.until do
-          case type
-          # Function only return true if element enabled or raise an error if time out
-          when 'element enable'
-            _find(*args).enabled?
-
-          # Function only return true if element disabled or raise an error if time out
-          when 'element disable'
-            !_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(*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(*args).empty?
-          end
-        end
-      else
-        wait.until do
-          case type
-          # Function only return true if element enabled or raise an error if time out
-          when 'element enable'
-            elements = page.find_elements(*args)
-            elements.each do |element|
-              if !visible.nil? && !text.nil?
-                if element.displayed? && element.text == text && element.enabled?
-                  return element
-                end
-              elsif !visible.nil?
-                if element.displayed? && element.enabled?
-                  return element
-                end
-              elsif !text.nil?
-                if element.text == text && element.enabled?
-                  return element
-                end
-              end
-            end
-            raise Appom::ElementsEmptyError, "Not found element"
-
-          # Function only return true if element disabled or raise an error if time out
-          when 'element disable'
-            elements = page.find_elements(*args)
-            elements.each do |element|
-              if !visible.nil? && !text.nil?
-                if element.displayed? && element.text == text && !element.enabled?
-                  return element
-                end
-              elsif !visible.nil?
-                if element.displayed? && !element.enabled?
-                  return element
-                end
-              elsif !text.nil?
-                if element.text == text && !element.enabled?
-                  return element
-                end
-              end
-            end
-            raise Appom::ElementsEmptyError, "Not found element"
-
-          # 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'
-            elements = page.find_elements(*args)
-            elements.each do |element|
-              if !visible.nil? && !text.nil?
-                if element.displayed? && element.text == text
-                  return element
-                end
-              elsif !visible.nil?
-                if element.displayed?
-                  return element
-                end
-              elsif !text.nil?
-                if element.text == text
-                  return element
-                end
-              end
-            end
-            raise Appom::ElementsEmptyError, "Not found element"
-
-          # Function only return true if we can't find at leat one element (array is empty) or raise error
-          when 'no element exists'
-            elements = page.find_elements(*args)
-            elements.each do |element|
-              if !visible.nil? && !text.nil?
-                if element.displayed? && element.text == text
-                  raise Appom::ElementsEmptyError, "Not found element"
-                end
-              elsif !visible.nil?
-                if element.displayed?
-                  raise Appom::ElementsEmptyError, "Not found element"
-                end
-              elsif !text.nil?
-                if element.text == text
-                  raise Appom::ElementsEmptyError, "Not found element"
-                end
-              end
-            end
-            return true
-          end
+      wait.until do
+        case type
+        # Function only return true if element enabled or raise an error if time out
+        when 'element enable'
+          _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
+        when 'at least one element exists'
+          !_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'
+          _all(*find_args).empty?
         end
-
       end
     end
 

data/lib/appom/version.rb

@@ -1,3 +1,3 @@
 module Appom
-  VERSION = '1.2.2'.freeze
+  VERSION = '1.3.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appom
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Harry.Tran
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appium_lib
@@ -82,14 +82,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.3
+      version: 2.2.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.19
 signing_key:
 specification_version: 4
 summary: A Page Object Model for Appium