appom 1.1.6 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca73259e6cc6e55a6def1bf2b0bbe9609e2b6c0fe80a86e7fcc9f8193d6f53ac
-  data.tar.gz: af52858128229cc9cdf69bf57bfb30cc2ec0e46816a7b33182981704ded448ed
+  metadata.gz: 35d79b86da3958d465691aa8f67adff728310412cfe8f898ec1f00b16efc0102
+  data.tar.gz: 3bea92052029e696b96c86bdacbdddaeaca1972fced1bb0e27592d0d13e1ca46
 SHA512:
-  metadata.gz: 29fd801a109c6e10a11ad173b32b157398d239edefe041142811e6a1c521611090c731e981d9c8236028797aa7eefe14f2f27bb030d22c6d977295306c76a625
-  data.tar.gz: 3eec972de070351475afe1178836b1031c7b64284d4f2878544a64f0c3d64d792e2b0a7905137a4410009f9be0954543e6ff86e144abd2b49a342eb104b6f381
+  metadata.gz: 9dfdae46709e5bc0657ae10c92010e2979ad8285673545b662fb04402b0dae1fa4a360b4755b05e5da303a66b9796e66be6b2cf113df4af05241b32cb8f2915c
+  data.tar.gz: d49e352631b8cd97fb50b5ba7bd5e712eb63cb23e01cdefb1125802382f79b200c590a042c5a511da794bd2b191ce010c27257a9207322c79ad93cafe2c1a578

data/lib/appom/element_container.rb

@@ -42,20 +42,13 @@ module Appom
       # Element doesn't support block so that will raise if pass a block when declare
       #
       def element(name, *find_args)
-        args, text = deduce_element_args(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
 
@@ -274,43 +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 args and other parameters
-      # @return args for appium and other parameters
-      #
-      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
-
-        args.each do |arg|
-          if arg.is_a?(Hash)
-            # Extract text value
-            if arg.key?(:text)
-              text = arg[:text]
-              args.delete(arg)
-            end
-          end
-        end
-        [args, text]
-      end
-
       ##
       # Extract section options
       # @return section class name and the remaining parameters

data/lib/appom/element_finder.rb

@@ -2,16 +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 do
-        elements = page.find_elements(*find_args)
+        elements = page.find_elements(*args)
         elements.each do |element|
-          if element.displayed?
+          # No need to check. Just return first element
+          if visible.nil? && text.nil?
             return element
           end
-        end
 
-        raise Appom::ElementsEmptyError, "Not found element displayed"
+          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
 
@@ -44,22 +60,6 @@ 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)
-      wait = Wait.new(timeout: Appom.max_wait_time)
-      wait.until do
-        elements = page.find_elements(*find_args)
-        elements.each do |element|
-          if element.displayed? && element.text == text
-            return element
-          end
-
-          raise Appom::ElementsEmptyError, "Not found element with text #{text}"
-        end
-      end
-    end
-
     # Function is used to check
     # Note: Function WILL NOT RETURN ELEMENT
     def wait_until(type, *find_args)
@@ -81,5 +81,36 @@ module Appom
         end
       end
     end
+
+    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.6'.freeze
+  VERSION = '1.2.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appom
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.0
 platform: ruby
 authors:
 - Harry.Tran