appom 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cafb8a939a6ef3b7bc2c06438923c6eb67633b5231553633bff5aad3af94ab67
-  data.tar.gz: 5f5a702a61a8550d0826183e36e7bd42d62de9b8aea8957886ed3487bb1eea11
+  metadata.gz: e2853e5118fd75268ff6297448f91e01994b2f4a06a22e00cd92963dc08215b0
+  data.tar.gz: d911296d61b4568e3e9f73453bd931aba4647a86e81b4fc3bf20c92c7c26ae0b
 SHA512:
-  metadata.gz: d38ab6b6237cf7a7620ab177d3081c39de1b8deae54e82ecf4a93fc66f40dc16aab951af3d5f18a65bf15a4ad66d2604978feca49a56baf3b1edb3e775737cd9
-  data.tar.gz: 042205757568fee70037fafcb32a424f6847dc446cf67645351c3139483bb30d854f5f44951073c97f1354c9f3dc5d6d798550ad584fd1ef4c93dfddf1595a47
+  metadata.gz: a822cac2b1155cd1aa21eeb6263f361e669f0c90911ffd444b041d37ed2fb6ec03a054d5d2bd87a2a21f6f097ebb80dfd98c661aac5c1a44fa135e0ba9e2d597
+  data.tar.gz: 3cfaea41cb2cdb4ec8c337f53d8342d0153c2e8483412d0c43cfdbbd0a74f4b1f1a18afc9ba64030885f72ad228c7c183a5ac32ec7c783fe0221587e574b1c22

data/lib/appom/element_container.rb

@@ -14,6 +14,38 @@ module Appom
       raise Appom::UnsupportedBlockError
     end
 
+    # # Check container has element
+    # def not_contain_element(element_name)
+    #   element_params = send("#{element_name}_params")
+    #   wait_until('no element exists', *element_params)
+    # end
+    #
+    # # Check container has elements
+    # def contain_elements(element_names)
+    #   element_names.each do |element|
+    #     contain_element(element)
+    #   end
+    # end
+    #
+    # Check container has element
+    # def contain_element(element_name)
+    #   element_params = send("#{element_name}_params")
+    #   puts "Elemenet params = #{element_params}"
+    #   wait_until('at least one element exists', *element_params)
+    # end
+    #
+    # # Check container has element and element is disabled
+    # def contain_disabled_element(element_name)
+    #   element_params = send("#{element_name}_params")
+    #   wait_until('element disable', *element_params)
+    # end
+    #
+    # # Check container has element and element is enabled
+    # def contain_enableb_element(element_name)
+    #   element_params = send("#{element_name}_params")
+    #   wait_until('element enable', *element_params)
+    # end
+
     ##
     # Options re-combiner. This takes the original inputs and combines
     # them such that there is only one hash passed as a final argument
@@ -46,11 +78,16 @@ module Appom
         build_element(name, *args) do
           define_method(name) do |*runtime_args, &block|
             raise_if_block(self, name, !block.nil?, :element)
-            _find(*merge_args(args, runtime_args))
+            if text.nil?
+              _find(*merge_args(args, runtime_args))
+            else
+              find_element_has_text(text, *merge_args(args, runtime_args))
+            end
           end
 
-          create_get_element_params(name, args)
           create_verify_element_text(name, text, args)
+
+          create_get_element_params(name, find_args)
         end
       end
 
@@ -87,8 +124,6 @@ module Appom
 
           create_get_element_params(name, find_args)
         end
-
-
       end
 
       def sections(name, *args, &block)
@@ -190,21 +225,6 @@ module Appom
         end
       end
 
-      ##
-      # Check element non-existent
-      # We will try to find all elements with *find_args
-      # Condition is pass when response is empty
-      #
-      def create_nonexistence_checker(element_name, *find_args)
-        method_name = "wait_until_has_no_#{element_name}"
-        create_helper_method(method_name, *find_args) do
-          define_method(method_name) do |*runtime_args|
-            args = merge_args(find_args, runtime_args)
-            wait_check_until_empty(*args)
-          end
-        end
-      end
-
       ##
       # Try to get all elements until not get empty array
       #
@@ -233,28 +253,44 @@ module Appom
         end
       end
 
+
       ##
-      # Try wait until element will be enable
+      # Check element non-existent
+      # We will try to find all elements with *find_args
+      # Condition is pass when response is empty
+      #
+      def create_nonexistence_checker(element_name, *find_args)
+        method_name = "wait_until_has_no_#{element_name}"
+        create_helper_method(method_name, *find_args) do
+          define_method(method_name) do |*runtime_args|
+            args = merge_args(find_args, runtime_args)
+            wait_check_until_empty(*args)
+          end
+        end
+      end
+
+      ##
+      # Wait until element will be enable
       #
       def create_enable_checker(element_name, *find_args)
         method_name = "wait_until_#{element_name}_enable"
         create_helper_method(method_name, *find_args) do
           define_method(method_name) do |*runtime_args|
             args = merge_args(find_args, runtime_args)
-            wait_until_element_enabled(*args)
+            wait_until('element enabled', *args)
           end
         end
       end
 
       ##
-      # Wait until an element will be
+      # Wait until an element will be disable
       #
       def create_disable_checker(element_name, *find_args)
         method_name = "wait_until_#{element_name}_disable"
         create_helper_method(method_name, *find_args) do
           define_method(method_name) do |*runtime_args|
             args = merge_args(find_args, runtime_args)
-            wait_until_element_disabled(*args)
+            wait_until('element disabled', *args)
           end
         end
       end
@@ -360,7 +396,6 @@ module Appom
       def extract_search_arguments(args)
         args if args && !args.empty?
       end
-
     end
   end
 end

data/lib/appom/element_finder.rb

@@ -33,9 +33,32 @@ module Appom
       end
     end
 
+
+
+    ##
+    # Wait until an element will be enable
+    #
+    def wait_until_element_enabled(*find_args)
+      wait = Wait.new(timeout: Appom.max_wait_time)
+      wait.until { page.find_element(*find_args).enabled? }
+    end
+
+    ##
+    # Wait until an element will be disable
+    #
+    def wait_until_element_disabled(*find_args)
+      wait = Wait.new(timeout: Appom.max_wait_time)
+      wait.until do  !page.
+          find_element(*find_args).enabled?
+      end
+    end
+
+
+
+
     ##
     # Use wait to get elements
-    # Before timeout we will try to find elements until response is not empty
+    # Before timeout we will try to find elements until response return array is not empty
     #
     def wait_until_get_not_empty(*find_args)
       wait = Wait.new(timeout: Appom.max_wait_time)
@@ -50,20 +73,47 @@ module Appom
       end
     end
 
-    ##
-    # Wait until an element will be enable
-    #
-    def wait_until_element_enabled(*find_args)
+    # 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 { page.find_element(*find_args).enabled? }
+      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
+          end
+        end
+
+        if !is_found
+          raise Appom::ElementsEmptyError, "Not found element with text #{text}"
+        end
+        return result
+      end
     end
 
-    ##
-    # Wait until an element will be disable
-    #
-    def wait_until_element_disabled(*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 { !page.find_element(*find_args).enabled? }
+      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?
+        end
+      end
     end
   end
 end

data/lib/appom/version.rb

@@ -1,3 +1,3 @@
 module Appom
-  VERSION = '1.0.3'.freeze
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appom
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Harry.Tran
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appium_lib
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: A Page Object Model for Appium