appom 1.1.4 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af44a4930d45306b62a8b2f383feed589ce9f6d7ce606f0425bda6f940eb3eb5
-  data.tar.gz: cbe7893e9b5ebac45b2488f5aa01092a46fc56ed7875217f186a37e4b4ac3b3c
+  metadata.gz: 2f484560756312f1f488680c7dac395f8a811c38d01f691fcb3259ea905c4bd6
+  data.tar.gz: 9e282e64e0afdaf5c38d7e91d5304ee5136543039bc30df66761ff8281079751
 SHA512:
-  metadata.gz: 3f0121294b4234366135e9a148d2b87dedac876ccd8d3a555adfc0479e9803beb257b9f8c378d4eb228b73b9b00911a643c3d5c39f79ed15d37503d8d4a2f947
-  data.tar.gz: f8a2a3a4aa46a3077fc532166268907f8dc165b34e5afb08d4c801d9e7da810d3255894ec02ed3573146049fbfa9a26c0956bf2c9cd1a402182f27ba0d61e951
+  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_container.rb

@@ -42,19 +42,13 @@ module Appom
       # Element doesn't support block so that will raise if pass a block when declare
       #
       def element(name, *find_args)
-        text, args = deduce_element_text(find_args)
-        build_element(name, *args) do
+        build_element(name, *find_args) do
           define_method(name) do |*runtime_args, &block|
             raise_if_block(self, name, !block.nil?, :element)
-            if text.nil?
-              _find(*merge_args(args, runtime_args))
-            else
-              find_element_has_text(text, *merge_args(args, runtime_args))
-            end
+            _find(*merge_args(find_args, runtime_args))
           end
 
-          create_get_element_params(name, args)
-          define_get_element_text(name, text)
+          create_get_element_params(name, find_args)
         end
       end
 
@@ -273,41 +267,6 @@ module Appom
         end
       end
 
-      ##
-      # Get text is passed when declared element
-      #
-      def define_get_element_text(element_name, text)
-        method_name = "#{element_name}_text"
-        define_method(method_name) do
-          text
-        end
-      end
-
-      ##
-      # Deduce text value
-      # @return expected text for element and the remaining parameters
-      #
-      def deduce_element_text(args)
-        # Flatten argument array first if we are in case array inside array
-        args = args.flatten
-
-        if args.empty?
-          raise(ArgumentError, 'You should provide search arguments in element creation')
-        end
-
-        # Get last key and check if it contain 'text' key
-        last_key = args.last
-        text = nil
-        if last_key.is_a?(Hash)
-          if last_key.key?(:text)
-            text = last_key[:text]
-            args.pop
-          end
-        end
-
-        [text, args]
-      end
-
       ##
       # Extract section options
       # @return section class name and the remaining parameters

data/lib/appom/element_finder.rb

@@ -2,8 +2,32 @@ module Appom
   module ElementFinder
     # Find an element
     def _find(*find_args)
+      args, text, visible = deduce_element_args(find_args)
       wait = Wait.new(timeout: Appom.max_wait_time)
-      wait.until { page.find_element(*find_args) }
+
+      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
+      end
     end
 
     # Find elements
@@ -11,7 +35,7 @@ module Appom
       page.find_elements(*find_args)
     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)
@@ -35,47 +59,149 @@ module Appom
       end
     end
 
-    # Find element with has text match with `text` value
-    # If not find element will raise error
-    def find_element_has_text(text, *find_args)
+    # Function is used to check
+    # Note: Function WILL NOT RETURN ELEMENT
+    def wait_until(type, *find_args)
       wait = Wait.new(timeout: Appom.max_wait_time)
-      wait.until do
-        elements = page.find_elements(*find_args)
-        is_found = false
-        elements.each do |element|
-          element_text = element.text
-          if element_text == text
-            return element
+      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"
 
-        if !is_found
-          raise Appom::ElementsEmptyError, "Not found element with text #{text}"
+          # 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
-        return result
+
       end
     end
 
-    # Function is used to check
-    # 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'
-          page.find_element(*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?
-        # 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?
-        # 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?
+    private
+
+    def deduce_element_args(args)
+      # Flatten argument array first if we are in case array inside array
+      args = args.flatten
+
+      if args.empty?
+        raise(ArgumentError, 'You should provide search arguments in element creation')
+      end
+
+      # Get last key and check if it contain 'text' key
+      text = nil
+      visible = nil
+
+      args.each do |arg|
+        if arg.is_a?(Hash)
+          # Extract text value
+          if arg.key?(:text)
+            text = arg[:text]
+            args.delete(arg)
+          end
+          # Extract visible value
+          if arg.key?(:visible)
+            visible = arg[:visible]
+            args.delete(arg)
+          end
         end
       end
+      [args, text, visible]
     end
   end
 end

data/lib/appom/version.rb

@@ -1,3 +1,3 @@
 module Appom
-  VERSION = '1.1.4'.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.1.4
+  version: 1.2.2
 platform: ruby
 authors:
 - Harry.Tran
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-04-19 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: []