appom 0.7.4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 589276e2a8ed788614bbf85ce919f1a6cd031ed430a2188497dd6c1e2d2183d0
-  data.tar.gz: 882ccfee6adf9f8ef4643402e533c04c5d975dfa49352df81b1d761021557b43
+  metadata.gz: b32d28e930a6f341aa50bfba1c2d5fce509b24f8490a791ffd285970e8fe07a0
+  data.tar.gz: 9373487e660babc46661f1f58431731582f53dc534ffb09bf9663b2f9f8f3f2d
 SHA512:
-  metadata.gz: 9bb546aa82daa1077d8b61e676303056652a057fcc1713074432c0c279a59fc4f611ee419ec5a1b485beeca4b0ea8fe29aba8563349ccdeaac64efe954c27858
-  data.tar.gz: 56a11c24fcd3e6b53be811c47357f9e18bab70de605c4a6dedecd149add080694861b77220ca61af4b83d2f0199ebd707fba6f638d73d0a2a6a3efce2fae6150
+  metadata.gz: 572dc5aca35bb42e9259eb87fe93ad63fa71daa7fa1c44785fab9ea39290462bc8707d79e3616a8a35b502e5064237029e21f1547f24fe4fbb4df7993a0ec80f
+  data.tar.gz: 2ad6d47691c224987da5b013424df6015768c0399893d2bc5f6373393c6bd55d05425da6319f5ca2e17ba37a5d7928823b1215b5564fe2faaef996e74dbd60cf

data/lib/appom.rb

@@ -16,6 +16,10 @@ module Appom
   class NoSuchElementError < StandardError; end
   # An elements is empty using the given search parameters.
   class ElementsEmptyError < StandardError; end
+  # Text from an element not equal expected text
+  class ElementsTextVerifyError < StandardError; end
+  # An element is define with no text value
+  class ElementsDefineNoTextError < StandardError; end
 
   autoload :ElementContainer, 'appom/element_container'
   autoload :Page, 'appom/page'

data/lib/appom/element_container.rb

@@ -42,14 +42,15 @@ module Appom
       # Element doesn't support block so that will raise if pass a block when declare
       #
       def element(name, *find_args)
-        build_element(name, *find_args) do
+        text, args = deduce_element_text(find_args)
+        build_element(name, *args) do
           define_method(name) do |*runtime_args, &block|
             raise_if_block(self, name, !block.nil?, :element)
-            _find(*merge_args(find_args, runtime_args))
-          end
-          define_method("#{name}_params") do
-            merge_args(find_args)
+            _find(*merge_args(args, runtime_args))
           end
+
+          create_get_element_params(name, args)
+          create_verify_element_text(name, text, args)
         end
       end
 
@@ -71,9 +72,8 @@ module Appom
             raise_if_block(self, name, !block.nil?, :elements)
             _all(*merge_args(find_args, runtime_args))
           end
-          define_method("#{name}_params") do
-            merge_args(find_args)
-          end
+
+          create_get_element_params(name, find_args)
         end
       end
 
@@ -84,10 +84,11 @@ module Appom
             section_element = _find(*merge_args(find_args, runtime_args))
             section_class.new(self, section_element)
           end
-          define_method("#{name}_params") do
-            merge_args(find_args)
-          end
+
+          create_get_element_params(name, find_args)
         end
+
+
       end
 
       def sections(name, *args, &block)
@@ -99,9 +100,8 @@ module Appom
               section_class.new(self, element)
             end
           end
-          define_method("#{name}_params") do
-            merge_args(find_args)
-          end
+
+          create_get_element_params(name, find_args)
         end
       end
 
@@ -259,6 +259,66 @@ module Appom
         end
       end
 
+      ##
+      # Verify text for an element
+      #
+      def create_verify_element_text(element_name, text, *find_args)
+        method_name = "#{element_name}_verify_text"
+
+        create_helper_method(method_name, *find_args) do
+          define_method(method_name) do |*runtime_args|
+            # Raise if element have no text value
+            if text.nil?
+              raise(ElementsDefineNoTextError, "#{name} element is define with no text value")
+            end
+
+            args = merge_args(find_args, runtime_args)
+            element = _find(*args)
+            element_text = element.text
+            if !element_text.eql?(text)
+              raise(ElementsTextVerifyError, "expected: value == #{text} got: #{element_text}")
+            end
+          end
+        end
+      end
+
+      ##
+      # Get parameter is passed when declared element
+      #
+      def create_get_element_params(element_name, *find_args)
+        method_name = "#{element_name}_params"
+        create_helper_method(method_name, *find_args) do
+          define_method(method_name) do
+            merge_args(find_args)
+          end
+        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/version.rb

@@ -1,3 +1,3 @@
 module Appom
-  VERSION = '0.7.4'.freeze
+  VERSION = '0.8.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appom
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors:
 - Harry.Tran
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2018-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appium_lib