appom 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af44a4930d45306b62a8b2f383feed589ce9f6d7ce606f0425bda6f940eb3eb5
-  data.tar.gz: cbe7893e9b5ebac45b2488f5aa01092a46fc56ed7875217f186a37e4b4ac3b3c
+  metadata.gz: 413f62216c8a9e8fde5b69001d39e7479b34a0625e747beeccde3334649719d8
+  data.tar.gz: 8739cc428c145008df6f59b923fe532b41434a099936ba0e7fc4a1b0532537a6
 SHA512:
-  metadata.gz: 3f0121294b4234366135e9a148d2b87dedac876ccd8d3a555adfc0479e9803beb257b9f8c378d4eb228b73b9b00911a643c3d5c39f79ed15d37503d8d4a2f947
-  data.tar.gz: f8a2a3a4aa46a3077fc532166268907f8dc165b34e5afb08d4c801d9e7da810d3255894ec02ed3573146049fbfa9a26c0956bf2c9cd1a402182f27ba0d61e951
+  metadata.gz: 8c747846946703a616271e19ae68d911b2eab95f76f6429adcefa90c1dd68b9b8330a98a257ace03665d675bde53a85d7f5ca9dddc46d78d962b4dd5e86effa9
+  data.tar.gz: 3998ed8432d928ec38c4cb5728ae0aef3766b7c4e0ba57549bf7ee0c6db59f595e0dcd40d09707ca47c440adb0e891d8161412e3786e99f46cabe811157fea93

data/lib/appom/element_container.rb

@@ -42,7 +42,8 @@ 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)
+        args, text = deduce_element_args(find_args)
+
         build_element(name, *args) do
           define_method(name) do |*runtime_args, &block|
             raise_if_block(self, name, !block.nil?, :element)
@@ -284,10 +285,10 @@ module Appom
       end
 
       ##
-      # Deduce text value
-      # @return expected text for element and the remaining parameters
+      # Deduce args and other parameters
+      # @return args for appium and other parameters
       #
-      def deduce_element_text(args)
+      def deduce_element_args(args)
         # Flatten argument array first if we are in case array inside array
         args = args.flatten
 
@@ -298,14 +299,17 @@ module Appom
         # 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
+
+        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
-
-        [text, args]
+        [args, text]
       end
 
       ##

data/lib/appom/element_finder.rb

@@ -41,7 +41,6 @@ module Appom
       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
@@ -49,10 +48,7 @@ module Appom
           end
         end
 
-        if !is_found
-          raise Appom::ElementsEmptyError, "Not found element with text #{text}"
-        end
-        return result
+        raise Appom::ElementsEmptyError, "Not found element with text #{text}"
       end
     end
 

data/lib/appom/version.rb

@@ -1,3 +1,3 @@
 module Appom
-  VERSION = '1.1.4'.freeze
+  VERSION = '1.1.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appom
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Harry.Tran
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-19 00:00:00.000000000 Z
+date: 2019-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appium_lib