appom 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e601fd52165d14faf9034b72ff67ffa96debfc5cbdf4613b7c316ed8141fbf2d
-  data.tar.gz: 6d66f8805aa55fc163f93bc08194711fa6e7858c7835eda3eeeff39fe02d9761
+  metadata.gz: 2f484560756312f1f488680c7dac395f8a811c38d01f691fcb3259ea905c4bd6
+  data.tar.gz: 9e282e64e0afdaf5c38d7e91d5304ee5136543039bc30df66761ff8281079751
 SHA512:
-  metadata.gz: 5df8393fe36883906a7f60980f8eff1faf89d9013708d91bed32b2fba1da19a3566e6c8c316ead100eca40b850e9c8890049c7ecb05d5228d4861094fd5a97bd
-  data.tar.gz: 66247fd2603d1250c168f0c8eeb634cd40d0e7178f6e37a825ec06a965ed07bcbd68b5eeb9f35ba3ee72eff4a7a8e14de7a21b6916db9e378b7f64290b4fa66b
+  metadata.gz: c39d03e79e31c983eda9dca7d4bafcf00994b2f60783f3d1723f108d89e9eb965bbd5d8aa197e394c4a60c0201a325e16ec700487a82ef34441ae401703de734
+  data.tar.gz: dc9c89c08d924e9e9d932f29598c42c3a852845c62083fd65b582d3007160993c6c163bffcbf1d8ac234db7cabe90537e2c7334a475068df060bc1952aecb80f

data/lib/appom/cucumber.rb

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

data/lib/appom/element_finder.rb

@@ -5,29 +5,28 @@ module Appom
       args, text, visible = deduce_element_args(find_args)
       wait = Wait.new(timeout: Appom.max_wait_time)
 
-      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
-            end
-          elsif !visible.nil?
-            if element.displayed?
-              return element
-            end
-          elsif !text.nil?
-            if element.text == text
-              return element
+      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
             end
           end
+          raise Appom::ElementsEmptyError, "Not found element with text #{text}"
         end
-        raise Appom::ElementsEmptyError, "Not found element with text #{text}"
       end
     end
 
@@ -64,23 +63,113 @@ module Appom
     # Note: Function WILL NOT RETURN ELEMENT
     def wait_until(type, *find_args)
       wait = Wait.new(timeout: Appom.max_wait_time)
-      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'
-          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
-        when 'no element exists'
-          args, text, visible = deduce_element_args(find_args)
-          page.find_elements(*args).empty?
+      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
+        end
+
       end
     end
 

data/lib/appom/version.rb

@@ -1,3 +1,3 @@
 module Appom
-  VERSION = '1.2.1'.freeze
+  VERSION = '1.2.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.2.2
 platform: ruby
 authors:
 - Harry.Tran
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-11 00:00:00.000000000 Z
+date: 2021-03-15 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
@@ -82,16 +82,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.3
+      version: 2.6.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: A Page Object Model for Appium
 test_files: []