automation_object 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 752355905e1e3e9177ad9e481b27abd8d0979076
-  data.tar.gz: e58e752b120609eb53030fc41c3ab5ccaee717b9
+  metadata.gz: 9c6397d7cf9b93c229e3184d39b5c97a674fe1b1
+  data.tar.gz: dd8e110716616306e04f0c6b31130473b98ababc
 SHA512:
-  metadata.gz: a59cd4c3e1b7843e825752e6e8921c45620733a2092305ec6746e04720c2f6bf8bcbf2e8a694769a6ba2e19fcbb341a88fa662eb62068dab4cbd0998fa25e6e1
-  data.tar.gz: 8adbce64b6b3ac96cde758814d2a643d5c04b2af2d302edd0aff46ebe9a780891721bc320b5865c63a59547fbb846395eccb77a81dfb97b3c7359379c93b3c5c
+  metadata.gz: 17a499eb9a9d18f29a0a44ba088a3a15d53f6fae349fb3a6c53615ef5f3e0eb0ee7feecd2bd8bb4c7874130f9a354f133ffe34f06dd8a6fbf0a4cb000d7f6bf5
+  data.tar.gz: deb26da5fc8ee5e6f473f3333303c3e3e8880f78e101aded3cee357559963bda93ee8ab24cdcaeba6462fc6d6931cda95fef199d1bf22081d43f95af9d625706

data/lib/automation_object/driver/appium_adapter/driver.rb

@@ -100,10 +100,10 @@ module AutomationObject
         # Window Handles Override
         # @return [Array<String>] array of window handles
         def window_handles
-          if @subject.device_is_android? && is_browser?
+          if @subject.device_is_android? && browser?
             window_handles = @subject.window_handles
           else
-            return @subject.available_contexts unless is_browser?
+            return @subject.available_contexts unless browser?
 
             window_handles = []
             @subject.available_contexts.each do |context|
@@ -117,7 +117,7 @@ module AutomationObject
         # Get window handle override
         # @return [String] current window handle
         def window_handle
-          return @subject.current_context unless is_browser?
+          return @subject.current_context unless browser?
 
           return @subject.window_handle if @subject.device_is_android?
 
@@ -137,7 +137,7 @@ module AutomationObject
 
         # @return [Boolean] document is complete
         def document_complete?
-          return true unless is_browser? # Skip for non-browser Appium sessions
+          return true unless browser? # Skip for non-browser Appium sessions
           @subject.execute_script('return document.readyState;') == 'complete'
         end
 

data/lib/automation_object/driver/common_selenium/driver.rb

@@ -6,16 +6,6 @@ module AutomationObject
     module CommonSelenium
       # Common Selenium/AppiumMethods
       module Driver
-        # Suspend timeout for block running
-        def suspend_timeout
-          original_timeout = @subject.manage.timeouts.implicit_wait
-          @subject.manage.timeouts.implicit_wait = 0
-
-          yield
-
-          @subject.manage.timeouts.implicit_wait = original_timeout
-        end
-
         # @return [Point] x,y scroll position
         def scroll_position
           position = Point.new

data/lib/automation_object/driver/selenium_adapter/driver.rb

@@ -48,11 +48,10 @@ module AutomationObject
           exists = false
 
           begin
-            suspend_timeout do
-              element_objects = @subject.find_elements(selector_type, selector_path)
-              exists = true unless element_objects.empty?
-            end
-          rescue StandardError
+            element_objects = @subject.find_elements(selector_type, selector_path)
+            exists = true unless element_objects.empty?
+          rescue StandardError => e
+            puts e
             return false
           end
 

data/lib/automation_object/dsl/element.rb

@@ -22,10 +22,7 @@ module AutomationObject
       def method_missing(method, *args, &block)
         return super if Element.methods.include?(method)
 
-        if @subject.is_a?(AutomationObject::Dsl::Element)
-          # puts "@state.load(:element, #{@name})"
-          @subject = @state.load(:element, @name)
-        end
+        @subject = @state.load(:element, @name)
 
         super
       end

data/lib/automation_object/dsl/element_array.rb

@@ -22,10 +22,7 @@ module AutomationObject
       def method_missing(method, *args, &block)
         return super if ElementArray.methods.include?(method)
 
-        if @subject.is_a?(AutomationObject::Dsl::ElementArray)
-          # puts "@state.load(:element_array, #{@name})"
-          @subject = @state.load(:element_array, @name)
-        end
+        @subject = @state.load(:element_array, @name)
 
         super
       end

data/lib/automation_object/dsl/element_hash.rb

@@ -22,10 +22,7 @@ module AutomationObject
       def method_missing(method, *args, &block)
         return super if ElementHash.methods.include?(method)
 
-        if @subject.is_a?(AutomationObject::Dsl::ElementHash)
-          # puts "@state.load(:element_hash, #{@name})"
-          @subject = @state.load(:element_hash, @name)
-        end
+        @subject = @state.load(:element_hash, @name)
 
         super
       end

data/lib/automation_object/dsl/modal.rb

@@ -30,8 +30,8 @@ module AutomationObject
       def method_missing(method, *args, &block)
         return super if Modal.methods.include?(method)
 
-        # Attempt to load screen if composite object contains that child
-        if @subject.methods.include?(method)
+        # Attempt to load modal if composite object contains that child
+        if @subject.to_h.include?(method)
           # puts "@state.load(:modal, #{@name})"
           @state.load(:modal, @name)
         end

data/lib/automation_object/dsl/screen.rb

@@ -33,13 +33,18 @@ module AutomationObject
         return super if Screen.methods.include?(method)
 
         # Attempt to load screen if composite object contains that child
-        if @subject.methods.include?(method)
+        if @subject.to_h.include?(method)
           # puts "@state.load(:screen, #{@name})"
           @state.load(:screen, @name)
         end
 
         super
       end
+
+      # @return [Boolean]
+      def active?
+        @state.active?(:screen, @name)
+      end
     end
   end
 end

data/lib/automation_object/state/composite/_base.rb

@@ -17,7 +17,7 @@ module AutomationObject
 
         # @param session [AutomationObject::State::Session] session
         # @param driver [AutomationObject::Driver] driver
-        # @param blue_prints [AutomationObject::BluePrint::Composite] blue print composite
+        # @param blue_prints [AutomationObject::BluePrint::Composite::Base] blue print composite
         # @param name [Symbol] name of composite element
         # @param parent [Object, nil] parent composite object
         # @param location [String] string location for error/debugging purposes
@@ -62,13 +62,19 @@ module AutomationObject
 
         # Recursive function to reach parent screen
         # Can return nil if above a screen!
-        # @return [AutomationObject::State::BluePrintAdapter::Screen,nil]
+        # @return [AutomationObject::State::Composite::Screen,nil]
         def screen
           return nil if is_a?(Top)
 
           # Should recursively call top until parent is nil
           is_a?(Screen) ? self : parent.screen
         end
+
+        # Recursive function to reach top
+        # @return [AutomationObject::State::Composite::Top]
+        def top
+          is_a?(Top) ? self : parent.top
+        end
       end
     end
   end

data/lib/automation_object/state/composite/_common_element.rb

@@ -6,6 +6,12 @@ module AutomationObject
     module Composite
       # Helper module for Element composite classes
       module CommonElement
+        attr_accessor :cache
+
+        def reset
+          self.cache = nil
+        end
+
         def method_hook?(name)
           blue_prints.method_hooks.key?(name)
         end
@@ -16,8 +22,9 @@ module AutomationObject
 
           @method_hooks = {}
           blue_prints.method_hooks.each do |key, blue_prints|
-            @method_hooks[key] = Hook.new(blue_prints,
+            @method_hooks[key] = Hook.new(session,
                                           driver,
+                                          blue_prints,
                                           key,
                                           self,
                                           location + "[#{key}]")

data/lib/automation_object/state/composite/element.rb

@@ -13,8 +13,10 @@ module AutomationObject
 
         # @return [AutomationObject::State::Composite::ElementProxy] Selenium proxy
         def load
+          return cache if cache
+
           element = driver.find_element(*blue_prints.selector_params)
-          ElementProxy.new(self, element)
+          self.cache = ElementProxy.new(self, element)
         end
       end
     end

data/lib/automation_object/state/composite/element_array.rb

@@ -13,13 +13,13 @@ module AutomationObject
 
         # @return [Array<AutomationObject::State::Composite::ElementProxy>] Selenium proxy
         def load
+          return cache if cache
+
           elements = driver.find_elements(*blue_prints.selector_params)
 
-          wrapped_elements = elements.map do |element|
+          self.cache = elements.map do |element|
             ElementProxy.new(self, element)
           end
-
-          wrapped_elements
         end
       end
     end

data/lib/automation_object/state/composite/element_hash.rb

@@ -13,8 +13,10 @@ module AutomationObject
 
         # @return [Hash<String, AutomationObject::State::Composite::ElementProxy>] Selenium proxy
         def load
+          return cache if cache
+
           elements = driver.find_elements(*blue_prints.selector_params)
-          elements_hash = {}
+          self.cache = {}
 
           elements.each do |element|
             # Want to wrap element, before sending for method!
@@ -22,10 +24,10 @@ module AutomationObject
             wrapped_element = ElementProxy.new(self, element)
             hash_key = wrapped_element.send(blue_prints.define_elements_by) # Send to wrapped state proxy
 
-            elements_hash[hash_key] = wrapped_element
+            cache[hash_key] = wrapped_element
           end
 
-          elements_hash
+          cache
         end
       end
     end

data/lib/automation_object/state/composite/helpers/window.rb

@@ -6,10 +6,12 @@ module AutomationObject
     module Composite
       # Window class
       class Window
-        # @param [AutomationObject::Driver::Driver] driver
-        # @param [String] handle
-        # @param [Symbol] screen
-        def initialize(driver, handle, screen)
+        # @param window_manager [AutomationObject::State::Composite::WindowManager]
+        # @param driver [AutomationObject::Driver::Driver]
+        # @param handle [String]
+        # @param screen [Symbol]
+        def initialize(window_manager, driver, handle, screen)
+          @window_manager = window_manager
           @driver = driver
           @handle = handle
 
@@ -18,6 +20,22 @@ module AutomationObject
           @history = [screen]
         end
 
+        # @return [Symbol,nil] previous screen name
+        def previous
+          return nil if @position < 1
+          @history[@position - 1]
+        end
+
+        # @param name [Symbol] screen name
+        # @return [void]
+        def update(name)
+          # Reset current screen
+          @window_manager.screens[self.name].reset
+
+          @position += 1
+          @history << name
+        end
+
         # @return [Symbol] current screen
         def name
           @history[@position]

data/lib/automation_object/state/composite/helpers/window_manager.rb

@@ -7,8 +7,6 @@ module AutomationObject
     module Composite
       # Collection to manage Window objects
       module WindowManager
-        attr_accessor :window
-
         # @param name [Symbol] name of window to use
         # @return [void]
         def use(name)
@@ -18,11 +16,12 @@ module AutomationObject
             next if window.name != name
             return if window == self.window
 
-            self.window = window
-            self.window.use
+            @window = window
+            @window.use
           end
         end
 
+        # @return [AutomationObject::State::Composite::Window]
         def window
           raise AutomationObject::State::Error::NoActiveWindows unless @window
           @window
@@ -51,8 +50,8 @@ module AutomationObject
           # Should only have one extra window
           raise UnexpectedExtraWindowError if diff_handles.length > 1
 
-          self.window = Window.new(driver, diff_handles.first, name)
-          windows << window
+          @window = Window.new(self, driver, diff_handles.first, name)
+          windows << @window
         end
       end
     end

data/lib/automation_object/state/composite/hook.rb

@@ -16,8 +16,7 @@ module AutomationObject
           return nil if blue_prints.live?.empty?
 
           blue_prints.live?.each do |element_requirement_blueprints|
-            hook_element_requirement = ElementRequirement.new(element_requirement_blueprints,
-                                                              driver, self, 1)
+            hook_element_requirement = ElementRequirement.new(self, driver, element_requirement_blueprints, 1)
             return false unless hook_element_requirement.run
           end
 

data/lib/automation_object/state/composite/hook_action.rb

@@ -23,8 +23,8 @@ module AutomationObject
             hook_action_class = AutomationObject::State::Composite.const_get(hook_name.to_s.pascalize)
             blue_prints = self.blue_prints.send(hook_name)
 
-            hook_action = hook_action_class.new(blue_prints: blue_prints, composite: self)
-            return false if hook_action.run == false
+            hook_action = hook_action_class.new(self, driver, blue_prints)
+            return false if hook_action.run == false # Use long form, can return nil!
           end
 
           true

data/lib/automation_object/state/composite/hook_actions/action_loop.rb

@@ -4,31 +4,40 @@ module AutomationObject
     module Composite
       # Composite action loop base class
       class ActionLoop
-        attr_accessor :composite, :blue_prints, :loops
+        # @return [AutomationObject::State::Composite::Base]
+        attr_accessor :composite
+        # @return [AutomationObject::Driver::Driver]
+        attr_accessor :driver
+        # @return [AutomationObject::BluePrint::Composite::Base]
+        attr_accessor :blue_prints
+        # @return [Integer]
+        attr_accessor :loops
 
-        def initialize(blue_prints, driver, composite, loops = 30)
-          self.blue_prints = blue_prints
-          self.driver = driver
+        # @param composite [AutomationObject::State::Composite::Base]
+        # @param driver [AutomationObject::Driver::Driver]
+        # @param blue_prints [AutomationObject::BluePrint::Composite::Base]
+        # @param loops [Integer]
+        def initialize(composite, driver, blue_prints, loops = 30)
           self.composite = composite
+          self.driver = driver
+          self.blue_prints = blue_prints
           self.loops = loops
         end
 
-        def driver
-          composite.driver
-        end
-
         # @return [Boolean] run success or not
         def run
           loops.times do
+            # Sub classes implement single run
             return true if single_run
           end
 
           false
         end
 
+        # Abstract method, override
         # @return [Boolean] success or not
         def single_run
-          raise 'Abstract Issue'
+          raise NotImplementedError
         end
       end
     end

data/lib/automation_object/state/composite/hook_actions/change_screen.rb

@@ -6,17 +6,12 @@ module AutomationObject
     module Composite
       # Change screen hook loop
       class ChangeScreen < ActionLoop
-        def initialize(args = {})
-          super
-          @new_screen_name = args.fetch :blue_prints
-        end
-
         def single_run
           return false unless driver.document_complete?
 
-          new_screen = composite.top.screens[@new_screen_name]
-          if new_screen.load.live?
-            composite.top.set_screen(@new_screen_name)
+          new_screen = composite.top.screens[blue_prints]
+          if new_screen.load.live? != false # Need strict
+            composite.top.window.update(blue_prints)
             return true
           else
             return false

data/lib/automation_object/state/composite/hook_actions/change_to_previous_screen.rb

@@ -9,9 +9,9 @@ module AutomationObject
         def single_run
           return false unless driver.document_complete?
 
-          new_screen = composite.top.current_window.previous_screen_name
-          if new_screen.load.live?
-            composite.top.set_screen(new_screen)
+          new_screen = composite.top.window.previous
+          if new_screen.load.live? != false
+            composite.top.window.update(new_screen)
             return true
           else
             return false

data/lib/automation_object/state/composite/hook_actions/new_screen.rb

@@ -7,10 +7,6 @@ module AutomationObject
     module Composite
       # New screen hook loop
       class NewScreen < ActionLoop
-        def initialize(args = {})
-          super
-        end
-
         def single_run
           new_screen_name = blue_prints
           new_screen = composite.top.screens[new_screen_name]

data/lib/automation_object/state/composite/hook_actions/possible_screen_changes.rb

@@ -8,8 +8,8 @@ module AutomationObject
       class PossibleScreenChanges < ActionLoop
         def single_run
           blue_prints.each do |possible_screen_name|
-            if possible_screen_name.load.live?
-              composite.top.set_screen(possible_screen_name)
+            if possible_screen_name.load.live? != false
+              composite.top.window.update(possible_screen_name)
               return true
             end
           end

data/lib/automation_object/state/composite/hook_actions/show_modal.rb

@@ -6,16 +6,11 @@ module AutomationObject
     module Composite
       # Show modal hook loop
       class ShowModal < ActionLoop
-        def initialize(args = {})
-          super
-          @new_modal_name = args.fetch :blue_prints
-        end
-
         def single_run
-          new_modal = composite.screen.modals[@new_modal_name]
+          new_modal = composite.screen.modals[blue_prints]
 
           if new_modal.load.live? != false
-            composite.screen.current_modal = @new_modal_name
+            composite.screen.current_modal = blue_prints
             composite.screen.modal = new_modal
             return true
           else

data/lib/automation_object/state/composite/hook_actions/sleep.rb

@@ -6,13 +6,8 @@ module AutomationObject
     module Composite
       # Sleep hook loop
       class Sleep < ActionLoop
-        def initialize(args = {})
-          super
-          @time = args.fetch :blue_prints
-        end
-
         def single_run
-          sleep(@time)
+          sleep(blue_prints)
         end
       end
     end

data/lib/automation_object/state/composite/hook_actions/wait_for_elements.rb

@@ -8,9 +8,7 @@ module AutomationObject
       class WaitForElements < ActionLoop
         def single_run
           blue_prints.each do |hook_element_requirement|
-            hook_element_requirement = ElementRequirement.new(blue_prints: hook_element_requirement,
-                                                              composite: self,
-                                                              loops: 1)
+            hook_element_requirement = ElementRequirement.new(driver, hook_element_requirement, 1)
             return false unless hook_element_requirement.run
           end
 

data/lib/automation_object/state/composite/screen.rb

@@ -43,6 +43,12 @@ module AutomationObject
           end
         end
 
+        def reset
+          elements.values.map(&:reset)
+          element_arrays.values.map(&:reset)
+          element_hashes.values.map(&:reset)
+        end
+
         # Whether or not modal is active
         # @return [Boolean]
         attr_accessor :active

data/lib/automation_object/state/session.rb

@@ -23,6 +23,8 @@ module AutomationObject
         self.composite = Composite::Top.new(self, driver, blue_prints)
       end
 
+      # @param type [Symbol]
+      # @param name [Symbol]
       def load(type, name)
         case type
         when :screen
@@ -35,6 +37,18 @@ module AutomationObject
           raise AutomationObject::State::UndefinedLoadTypeError
         end
       end
+
+      # @param type [Symbol]
+      # @param name [Symbol]
+      # @return [Boolean]
+      def active?(type, name)
+        case type
+        when :screen
+          composite.live_screens.include?(name)
+        else
+          raise AutomationObject::State::UndefinedLoadTypeError
+        end
+      end
     end
   end
 end

data/lib/automation_object/step_definitions/element.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require_relative 'support/parse'
+require_relative 'support/minitest'
 
 # Description: Provides step definitions related to elements
 
@@ -18,7 +19,7 @@ end
 # - I type "blah" into the "home_screen" "text_field" element
 # - I type "test" in the "home_screen" "text_field" element
 # - I type "blah" in "home_screen" "text_field" element
-When(/^I type "([\w\s]+|%\{[\w\d]+\})" in(?:to)? (?:the )?"(\w+|%\{[\w\d]+\})" "(\w+|%\{[\w\d]+\})" element$/) do |*args|
+When(/^I type "([^"]+|%\{[\w\d]+\})" in(?:to)? (?:the )?"(\w+|%\{[\w\d]+\})" "(\w+|%\{[\w\d]+\})" element$/) do |*args|
   text, screen, element = AutomationObject::StepDefinitions::Parse.new(args).get
   AutomationObject::Framework.get.send(screen).send(element).send_keys(text)
 end

data/lib/automation_object/step_definitions/element_array.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require_relative 'support/parse'
 require_relative 'support/element_array'
+require_relative 'support/minitest'
 
 # Description: Provides step definitions related to element arrays
 
@@ -23,7 +24,7 @@ end
 # For: Typing into element array field
 # Examples:
 # - I type "blah" into the first "home_screen" "text_field" element array
-When(%r(^I type "([\w\s]+|%\{[\w\d]+\})" in(?:to| to)? (?:the )?(%\{[\w\d]+\}|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{[\w\d]+\})" "(\w+|%\{[\w\d]+\})" element array$/)) do |*args|
+When(%r(^I type "([\w\s]+|%\{[\w\d]+\})" in(?:to| to)? (?:the )?(%\{[\w\d]+\}|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{[\w\d]+\})" "(\w+|%\{[\w\d]+\})" element array$)) do |*args|
   text, key, low_range, high_range, screen, element = AutomationObject::StepDefinitions::Parse.new(args).get
 
   AutomationObject::StepDefinitions::ElementArray.iterate_and_do(
@@ -36,7 +37,7 @@ end
 # For: Scrolling element array item(s) into focus
 # Examples:
 # - I scroll to the first "home_screen" "logo_button" element array
-When(%r(^I (?:scroll |focus )(?:to |through )(?:the )?(%\{[\w\d]+\}|all|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{[\w\d]+\})" "(\w+|%\{[\w\d]+\})" element array$/)) do |*args|
+When(%r(^I (?:scroll |focus )(?:to |through )(?:the )?(%\{[\w\d]+\}|all|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{[\w\d]+\})" "(\w+|%\{[\w\d]+\})" element array$)) do |*args|
   key, low_range, high_range, screen, element = AutomationObject::StepDefinitions::Parse.new(args).get
 
   AutomationObject::StepDefinitions::ElementArray.iterate_and_do(
@@ -47,7 +48,7 @@ end
 # For: Saving value from element array for use later
 # Examples:
 # - I save "text" as "unique_value" from the first "home_screen" "logo_button" element array
-When(%r(^I save "(\w+|%\{[\w\d]+\})" as "([\w\d]+)" from (?:the )?(%\{[\w\d]+\}|all|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{[\w\d]+\})" "(\w+|%\{[\w\d]+\})" element array$/)) do |*args|
+When(%r(^I save "(\w+|%\{[\w\d]+\})" as "([\w\d]+)" from (?:the )?(%\{[\w\d]+\}|all|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{[\w\d]+\})" "(\w+|%\{[\w\d]+\})" element array$)) do |*args|
   method, value_key, key, low_range, high_range, screen, element = AutomationObject::StepDefinitions::Parse.new(args).get
 
   AutomationObject::StepDefinitions::ElementArray.iterate_and_do(
@@ -61,7 +62,7 @@ end
 # For: Testing the element arrays size
 # Examples:
 # - the "home_screen" "title" element array should be greater than 0
-Then(%r(^(?:the )?"([\w\d]+|%\{[\w\d]+\})" "(\w+|%\{[\w\d]+\})" element array should(n't|not)? (?:be )?(larger th[ae]n|greater th[ae]n|less th[ae]n|smaller th[ae]n|equals?) (?:to )?(\d+)$/)) do |*args|
+Then(%r(^(?:the )?"([\w\d]+|%\{[\w\d]+\})" "(\w+|%\{[\w\d]+\})" element array should(n't|not)? (?:be )?(larger th[ae]n|greater th[ae]n|less th[ae]n|smaller th[ae]n|equals?) (?:to )?(\d+)$)) do |*args|
   screen, element, negative, comparison, expected_value = AutomationObject::StepDefinitions::Parse.new(args).get
 
   element_array = AutomationObject::Framework.get.send(screen).send(element)
@@ -95,7 +96,7 @@ end
 # - the random "home_screen" "title" element array "text" should not equal "Home"
 # - the 0..9 "home_screen" "title" element array "text" should equal "Home"
 # - the all "home_screen" "title" element array "text" should not equal "Home"
-Then(%r(^(?:the )?(%\{\w+\}|all|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{[\w\d]+\})" "(\w+|%\{[\w\d]+\})" element array "(\w+|%\{[\w\d]+\})" should?(n't| not)? equal "(\w+|%\{[\w\d]+\})"$/)) do |*args|
+Then(%r(^(?:the )?(%\{\w+\}|all|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{[\w\d]+\})" "(\w+|%\{[\w\d]+\})" element array "(\w+|%\{[\w\d]+\})" should?(n't| not)? equal "(\w+|%\{[\w\d]+\})"$)) do |*args|
   key, low_range, high_range, screen, element, method, negative, expected_value = AutomationObject::StepDefinitions::Parse.new(args).get
 
   AutomationObject::StepDefinitions::ElementArray.iterate_and_do(
@@ -116,7 +117,7 @@ end
 # - the "home_screen" "title" element array "text" should be unique
 # - the "home_screen" "title" element array "text" should not be unique
 # - the "home_screen" "title" element array "text" shouldn't be unique
-Then(%r(^(?:the )?"([\w\d]+|%\{[\w\d]+\})" "([\w\d]+|%\{[\w\d]+\})" element array "([\w\d]+|%\{[\w\d]+\})" should(n't| not)? be unique$/)) do |*args|
+Then(%r(^(?:the )?"([\w\d]+|%\{[\w\d]+\})" "([\w\d]+|%\{[\w\d]+\})" element array "([\w\d]+|%\{[\w\d]+\})" should(n't| not)? be unique$)) do |*args|
   screen, element, method, negative = AutomationObject::StepDefinitions::Parse.new(args).get
 
   element_array = AutomationObject::Framework.get.send(screen).send(element)

data/lib/automation_object/step_definitions/element_hash.rb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 require_relative 'support/parse'
 require_relative 'support/element_hash'
+require_relative 'support/minitest'
 
 # Description: Provides step definitions related to element hashes
 
 # For: Calling an element hash method
 # Examples:
 # - I click on the first "home_screen" "about_button" element hash
-When(%r(^I (\w+|%\{[\w\d]+\})?(?: on| over)?(?: the| a)? (%\{[\w\d]+\}|all|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{[\w\d]+\})" "(\w+|%\{[\w\d]+\})" element hash/)) do |*args|
+When(%r(^I (\w+|%\{[\w\d]+\})?(?: on| over)?(?: the| a)? (%\{[\w\d]+\}|all|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{[\w\d]+\})" "(\w+|%\{[\w\d]+\})" element hash$)) do |*args|
   method, key, low_range, high_range, screen, element = AutomationObject::StepDefinitions::Parse.new(args).get
 
   AutomationObject::StepDefinitions::ElementHash.iterate_and_do(
@@ -20,7 +21,7 @@ end
 # For: Typing into element hash field
 # Examples:
 # - I type "blah" into the first "home_screen" "text_field" element hash
-When(%r(^I type "([\w\s]+|%\{[\w\d]+\})" in(?:to| to)? (?:the )?(%\{[\w\d]+\}|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{[\w\d]+\})" "(\w+|%\{[\w\d]+\})" element hash/)) do |*args|
+When(%r(^I type "([\w\s]+|%\{[\w\d]+\})" in(?:to| to)? (?:the )?(%\{[\w\d]+\}|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{[\w\d]+\})" "(\w+|%\{[\w\d]+\})" element hash$)) do |*args|
   text, key, low_range, high_range, screen, element = AutomationObject::StepDefinitions::Parse.new(args).get
 
   AutomationObject::StepDefinitions::ElementHash.iterate_and_do(
@@ -33,7 +34,7 @@ end
 # For: Scrolling element hash item(s) into focus
 # Examples:
 # - I scroll to the first "home_screen" "logo_button" element hash
-When(%r(^I (?:scroll |focus )(?:to |through )(?:the )?(%\{[\w\d]+\}|all|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{[\w\d]+\})" "(\w+|%\{[\w\d]+\})" element hash/)) do |*args|
+When(%r(^I (?:scroll |focus )(?:to |through )(?:the )?(%\{[\w\d]+\}|all|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{[\w\d]+\})" "(\w+|%\{[\w\d]+\})" element hash$)) do |*args|
   key, low_range, high_range, screen, element = AutomationObject::StepDefinitions::Parse.new(args).get
 
   AutomationObject::StepDefinitions::ElementHash.iterate_and_do(
@@ -44,7 +45,7 @@ end
 # For: Saving value from element hash for use later
 # Examples:
 # - I save "text" as "unique_value" from the first "home_screen" "logo_button" element hash
-When(%r(^I save "(\w+|%\{[\w\d]+\})" as "([\w\d]+)" from (?:the )?(%\{[\w\d]+\}|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{[\w\d]+\})" "(\w+|%\{[\w\d]+\})" element hash/)) do |*args|
+When(%r(^I save "(\w+|%\{[\w\d]+\})" as "([\w\d]+)" from (?:the )?(%\{[\w\d]+\}|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{[\w\d]+\})" "(\w+|%\{[\w\d]+\})" element hash$)) do |*args|
   method, value_key, key, low_range, high_range, screen, element = AutomationObject::StepDefinitions::Parse.new(args).get
 
   AutomationObject::StepDefinitions::ElementHash.iterate_and_do(
@@ -58,7 +59,7 @@ end
 # For: Testing the element hashes size
 # Examples:
 # - the "home_screen" "title" element hash should be greater than 0
-Then(%r(^(?:the )?"([\w\d]+|%\{[\w\d]+\})" "(\w+|%\{[\w\d]+\})" element hash should(n't|not)? (?:be )?(larger th[ae]n|greater th[ae]n|less th[ae]n|smaller th[ae]n|equals?) (?:to )?(\d+)$/)) do |*args|
+Then(%r(^(?:the )?"([\w\d]+|%\{[\w\d]+\})" "(\w+|%\{[\w\d]+\})" element hash should(n't|not)? (?:be )?(larger th[ae]n|greater th[ae]n|less th[ae]n|smaller th[ae]n|equals?) (?:to )?(\d+)$)) do |*args|
   screen, element, negative, comparison, expected_value = AutomationObject::StepDefinitions::Parse.new(args).get
 
   element_hash = AutomationObject::Framework.get.send(screen).send(element)
@@ -88,7 +89,7 @@ end
 # For: Testing if the element hash value equals a given value
 # Examples:
 # - the first "home_screen" "title" element hash "text" should equal "Home"
-Then(%r(^(?:the )?(%\{\w+\}|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{[\w\d]+\})" "(\w+|%\{[\w\d]+\})" element hash "(\w+|%\{[\w\d]+\})" should ?(n't |not )?equal "(\w+|%\{[\w\d]+\})"$/)) do |*args|
+Then(%r(^(?:the )?(%\{\w+\}|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{[\w\d]+\})" "(\w+|%\{[\w\d]+\})" element hash "(\w+|%\{[\w\d]+\})" should ?(n't |not )?equal "(\w+|%\{[\w\d]+\})"$)) do |*args|
   key, low_range, high_range, screen, element, method, negative, expected_value = AutomationObject::StepDefinitions::Parse.new(args).get
 
   AutomationObject::StepDefinitions::ElementHash.iterate_and_do(
@@ -107,7 +108,7 @@ end
 # For: Testing if the element hashes uniqueness
 # Examples:
 # - the "home_screen" "title" element hash "text" should be unique
-Then(%r(^(?:the )?"([\w\d]+|%\{[\w\d]+\})" "([\w\d]+|%\{[\w\d]+\})" element hash "([\w\d]+|%\{[\w\d]+\})" should(n't|not)? be unique$/)) do |*args|
+Then(%r(^(?:the )?"([\w\d]+|%\{[\w\d]+\})" "([\w\d]+|%\{[\w\d]+\})" element hash "([\w\d]+|%\{[\w\d]+\})" should(n't|not)? be unique$)) do |*args|
   screen, element, method, negative = AutomationObject::StepDefinitions::Parse.new(args).get
 
   element_hash = AutomationObject::Framework.get.send(screen).send(element)

data/lib/automation_object/step_definitions/screen.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require_relative 'support/parse'
+require_relative 'support/minitest'
 
 # Description: Provides step definitions related to screens
 
@@ -8,7 +9,7 @@ require_relative 'support/parse'
 # - I close the "contact" screen
 # - I close the screen
 # - I destroy the screen
-Then(%r(^I (?:close|destroy) the ("([\w\s]+|%\{[\w\d]+\})")? ?screen$/)) do |*args|
+Then(%r(^I (?:close|destroy) the ("([\w\s]+|%\{[\w\d]+\})")? ?screen$)) do |*args|
   _unparsed_name, name = AutomationObject::StepDefinitions::Parse.new(args).get
 
   if name
@@ -22,7 +23,7 @@ end
 # Examples:
 # - I navigate back on the screen
 # - I navigate back on the "contact" screen
-Then(%r(^I (?:navigate|go) back (?:on )?(?:the )?("([\w\s]+|%\{[\w\d]+\})")? ?screen$/)) do
+Then(%r(^I (?:navigate|go) back (?:on )?(?:the )?("([\w\s]+|%\{[\w\d]+\})")? ?screen$)) do
   _unparsed_name, name = AutomationObject::StepDefinitions::Parse.new(args).get
 
   if name
@@ -36,7 +37,7 @@ end
 # Examples:
 # - I switch to the "home" screen
 # - I focus the "contact" screen
-Then(%r(^I (?:switch|focus) (?:to )?(?:the )?"([\w\s]+|%\{[\w\d]+\})" screen$/)) do |*args|
+Then(%r(^I (?:switch|focus) (?:to )?(?:the )?"([\w\s]+|%\{[\w\d]+\})" screen$)) do |*args|
   screen = AutomationObject::StepDefinitions::Parse.new(args).get
   AutomationObject::Framework.get.focus(screen)
 end
@@ -47,7 +48,7 @@ end
 # - I set the "home" screen size to 1000x2000
 # - I set the screen width to 1000
 # - I set the screen height to 2000
-Then(%r(^I set the ("([\w\s]+|%\{[\w\d]+\})")? ?screen (size|width|height) to (\d+|(\d+)x(\d+))$/)) do |*args|
+Then(%r(^I set the ("([\w\s]+|%\{[\w\d]+\})")? ?screen (size|width|height) to (\d+|(\d+)x(\d+))$)) do |*args|
   _unparsed_screen, screen, dimension, size, width, height = AutomationObject::StepDefinitions::Parse.new(args).get
 
   screen = if screen
@@ -60,3 +61,17 @@ Then(%r(^I set the ("([\w\s]+|%\{[\w\d]+\})")? ?screen (size|width|height) to (\
   screen.width(size) if dimension == 'width' && size
   screen.height(size) if dimension == 'height' && size
 end
+
+# For: Test if screen is currently active
+# Examples:
+# - the "home" screen should be active
+# - the "login" screen shouldn't be active
+Then(%r(^the "([\w\s]+|%\{[\w\d]+\})" screen should ?(n't |not )?be active$)) do |*args|
+  screen, negative = AutomationObject::StepDefinitions::Parse.new(args).get
+
+  if negative
+    assert_equal false, AutomationObject::Framework.get.send(screen).active?
+  else
+    assert_equal true, AutomationObject::Framework.get.send(screen).active?
+  end
+end

data/lib/automation_object/step_definitions/support/cache.rb

@@ -4,7 +4,7 @@ module AutomationObject
   module StepDefinitions
     # Cache module for temporary storage of vars
     module Cache
-      module_function
+      extend self
 
       # Singleton hash, create new if needed
       # @return [Hash] hash of values saved or new hash

data/lib/automation_object/step_definitions/support/minitest.rb

@@ -0,0 +1,10 @@
+module MiniTestAssertions
+  def self.extended(base)
+    base.extend(MiniTest::Assertions)
+    base.assertions = 0
+  end
+
+  attr_accessor :assertions
+end
+
+World(MiniTestAssertions)

data/lib/automation_object/step_definitions/support/parse.rb

@@ -22,19 +22,19 @@ module AutomationObject
       private
 
       # Used to parse any embedded variables
-      # @param string [String] index of arg
+      # @param string [String, nil] index of arg
       # @return [String] parsed string
       def parse(string)
-        parsed_string = string
+        return string if string.nil?
 
-        string.scan(/%\{(\w+)\}/) do |cache_key|
-          cached_value = AutomationObject::StepDefinitions::Cache.get(cache_key)
-          next unless cached_value
+        string.scan(/%\{[\w\d]+\}/) do |cache_key|
+          unwrapped_cache_key = cache_key.gsub(/[%\{\}]/, '')
 
-          parsed_string.gsub("%{#{cache_key}}", cached_value)
+          cached_value = AutomationObject::StepDefinitions::Cache.get(unwrapped_cache_key)
+          return cached_value if cached_value
         end
 
-        parsed_string
+        string
       end
     end
   end

data/lib/automation_object/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module AutomationObject
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 end

data/lib/automation_object.rb

@@ -11,6 +11,7 @@ Kernel.suppress_warnings do
   require 'appium_lib'
   require 'selenium-webdriver'
   require 'colorize'
+  require 'pry'
 end
 
 # Local Files

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: automation_object
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Michael Blatter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2016-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -151,61 +151,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: minitest-bonus-assertions
+  name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
+        version: '5.9'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '5.9'
 - !ruby/object:Gem::Dependency
-  name: fakefs
+  name: minitest-bonus-assertions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
+        version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -433,6 +433,7 @@ files:
 - lib/automation_object/step_definitions/support/cache.rb
 - lib/automation_object/step_definitions/support/element_array.rb
 - lib/automation_object/step_definitions/support/element_hash.rb
+- lib/automation_object/step_definitions/support/minitest.rb
 - lib/automation_object/step_definitions/support/parse.rb
 - lib/automation_object/version.rb
 homepage: https://github.com/mikeblatter/automation_object