automation_object 0.8.1 → 0.8.2

data/lib/automation_object/helpers/composite.rb

@@ -42,16 +42,16 @@ module AutomationObject
     end
 
     # Abstract argument, override
-    # @param name [Symbol] name of child
-    # @param options [Hash] options for child
+    # @param _name [Symbol] name of child
+    # @param _options [Hash] options for child
     # @return child [Object] return child composite object
     def get_child(_name, _options)
       raise 'Abstract method'
     end
 
     # Abstract argument, override
-    # @param name [Symbol] name of child
-    # @param options [Hash] options for child
+    # @param _name [Symbol] name of child
+    # @param _options [Hash] options for child
     # @return children [Hash] return children and names
     def get_children(_name, _options)
       raise 'Abstract method'

data/lib/automation_object/page_object.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# Require public page object classes for overriding
+require_relative 'page_object/configuration'
+require_relative 'page_object/screen'
+require_relative 'page_object/modal'
+require_relative 'page_object/element'
+require_relative 'page_object/element_array'
+require_relative 'page_object/element_hash'
+
+module AutomationObject
+  # Public interface for PageObject
+  module PageObject
+  end
+end

data/lib/automation_object/page_object/base.rb

@@ -0,0 +1,22 @@
+module AutomationObject
+  module PageObject
+    class Base
+      class << self
+        attr_accessor :configuration
+
+        undef :configuration if defined? :configuration
+        def configuration
+          @configuration ||= {}
+        end
+
+        def set_property(name, value)
+          self.configuration[name] = value
+        end
+
+        def get_property(name)
+          self.configuration[name]
+        end
+      end
+    end
+  end
+end

data/lib/automation_object/page_object/configuration.rb

@@ -0,0 +1,35 @@
+require_relative 'base'
+
+module AutomationObject
+  module PageObject
+    class Configuration < Base
+      class << self
+        # Set base url
+        # @param url [String] base url
+        def base_url(url)
+          set_property(:base_url, url)
+        end
+
+        # @param name [Const]
+        def default_screen(name)
+          set_property(:default_screen, name)
+        end
+
+        # @param time [Numeric]
+        def screen_transition_sleep(time)
+          set_property(:screen_transition_sleep, time)
+        end
+
+        # @param hash [Hash]
+        def throttle_driver_methods(hash)
+          set_property(:throttle_driver_methods, hash)
+        end
+
+        # @param hash [Hash]
+        def throttle_element_methods(hash)
+          set_property(:throttle_element_methods, hash)
+        end
+      end
+    end
+  end
+end

data/lib/automation_object/page_object/element.rb

@@ -0,0 +1,10 @@
+require_relative 'base'
+
+module AutomationObject
+  module PageObject
+    class Element < Base
+      class << self
+      end
+    end
+  end
+end

data/lib/automation_object/page_object/element_array.rb

@@ -0,0 +1,10 @@
+require_relative 'base'
+
+module AutomationObject
+  module PageObject
+    class ElementArray < Base
+      class << self
+      end
+    end
+  end
+end

data/lib/automation_object/page_object/element_hash.rb

@@ -0,0 +1,10 @@
+require_relative 'base'
+
+module AutomationObject
+  module PageObject
+    class ElementHash < Base
+      class << self
+      end
+    end
+  end
+end

data/lib/automation_object/page_object/modal.rb

@@ -0,0 +1,10 @@
+require_relative 'base'
+
+module AutomationObject
+  module PageObject
+    class Modal < Base
+      class << self
+      end
+    end
+  end
+end

data/lib/automation_object/page_object/screen.rb

@@ -0,0 +1,10 @@
+require_relative 'base'
+
+module AutomationObject
+  module PageObject
+    class Screen < Base
+      class << self
+      end
+    end
+  end
+end

data/lib/automation_object/step_definitions/element.rb

@@ -7,20 +7,22 @@ require_relative 'support/parse'
 # Examples:
 # - I click on the "home_screen" "about_button" element
 # - I hover over the "home_screen" "test_link" element
+# - I hover over the "home_screen" "menu_modal" "test_link" element
 # - I tap on "home_screen" "logo_button" element
-When(%r(^I (\w+|%\{\w+\}) ?(?: on| over)? (?:the )?"(\w+|%\{\w+\})" "(\w+|%\{\w+\})" element$)) do |*args|
-  method, screen, element = AutomationObject::StepDefinitions::Parse.new(args).get
-  AutomationObject::Framework.get.screen(screen).element(element).send(method)
+When(%r(^I (\w+|%\{\w+\}) ?(?: on| over)? (?:the )?"(\w+|%\{\w+\})"\s*"?(\w+|%\{\w+\})?"?\s*"(\w+|%\{\w+\})" element$)) do |*args|
+  method, screen, modal, element = AutomationObject::StepDefinitions::Parse.new(args).get
+  AutomationObject::Framework.get.screen(screen).modal(modal).element(element).send(method)
 end
 
 # For: Type into element field
 # Examples:
 # - I type "blah" into the "home_screen" "text_field" element
 # - I type "test" in the "home_screen" "text_field" element
+# - I type "test" in the "home_screen" "menu_modal" "text_field" element
 # - I type "blah" in "home_screen" "text_field" element
-When(%r(^I type "([^"]+|%\{\w+\})" in(?:to)? (?:the )?"(\w+|%\{\w+\})" "(\w+|%\{\w+\})" element$)) do |*args|
-  text, screen, element = AutomationObject::StepDefinitions::Parse.new(args).get
-  AutomationObject::Framework.get.screen(screen).element(element).send_keys(text)
+When(%r(^I type "([^"]+|%\{\w+\})" in(?:to)? (?:the )?"(\w+|%\{\w+\})"\s*"?(\w+|%\{\w+\})?"?\s*"(\w+|%\{\w+\})" element$)) do |*args|
+  text, screen, modal, element = AutomationObject::StepDefinitions::Parse.new(args).get
+  AutomationObject::Framework.get.screen(screen).modal(modal).element(element).send_keys(text)
 end
 
 # For: Scroll element into focus
@@ -28,19 +30,21 @@ end
 # - I scroll to the "home_screen" "logo_button" element
 # - I focus to the "home_screen" "logo_button" element
 # - I scroll to "home_screen" "logo_button" element
-When(%r(^I (?:scroll |focus )to (?:the )?"(\w+|%\{\w+\})" "(\w+|%\{\w+\})" element$)) do |*args|
-  screen, element = AutomationObject::StepDefinitions::Parse.new(args).get
-  AutomationObject::Framework.get.screen(screen).element(element).scroll_into_view
+# - I scroll to "home_screen" "menu_modal" "logo_button" element
+When(%r(^I (?:scroll |focus )to (?:the )?"(\w+|%\{\w+\})"\s*"?(\w+|%\{\w+\})?"?\s*"(\w+|%\{\w+\})" element$)) do |*args|
+  screen, modal, element = AutomationObject::StepDefinitions::Parse.new(args).get
+  AutomationObject::Framework.get.screen(screen).modal(modal).element(element).scroll_into_view
 end
 
 # For: Save value from element for use later
 # Examples:
 # - I save "text" as "unique_value" from the "home_screen" "logo_button" element
 # - I save "id" as "unique_value" from "home_screen" "logo_button" element
-When(%r(^I save "(\w+|%\{\w+\})" as "(\w+)" from (?:the )?"(\w+|%\{\w+\})" "(\w+|%\{\w+\})" element$)) do |*args|
-  method, key, screen, element = AutomationObject::StepDefinitions::Parse.new(args).get
+# - I save "id" as "unique_value" from "home_screen" "menu_modal" "logo_button" element
+When(%r(^I save "(\w+|%\{\w+\})" as "(\w+)" from (?:the )?"(\w+|%\{\w+\})"\s*"?(\w+|%\{\w+\})?"?\s*"(\w+|%\{\w+\})" element$)) do |*args|
+  method, key, screen, modal, element = AutomationObject::StepDefinitions::Parse.new(args).get
   # Save value from called method/property
-  value = AutomationObject::Framework.get.screen(screen).element(element).send(method)
+  value = AutomationObject::Framework.get.screen(screen).modal(modal).element(element).send(method)
   AutomationObject::StepDefinitions::Cache.set(key, value)
 end
 
@@ -49,10 +53,11 @@ end
 # - the "home_screen" "title" element should exist
 # - the "home_screen" "title" element shouldn't exist
 # - "home_screen" "title" element should not exist
-Then(%r(^(?:the )?"(\w+|%\{\w+\})" "(\w+|%\{\w+\})" element should ?(n't |not )?exist$)) do |*args|
-  screen, element, negative = AutomationObject::StepDefinitions::Parse.new(args).get
+# - "home_screen" "menu_modal" "title" element should not exist
+Then(%r(^(?:the )?"(\w+|%\{\w+\})"\s*"?(\w+|%\{\w+\})?"?\s*"(\w+|%\{\w+\})" element should ?(n't |not )?exist$)) do |*args|
+  screen, modal, element, negative = AutomationObject::StepDefinitions::Parse.new(args).get
 
-  exists = AutomationObject::Framework.get.screen(screen).element(element).exists?
+  exists = AutomationObject::Framework.get.screen(screen).modal(modal).element(element).exists?
   if negative
     expect(exists).to eq(false)
   else
@@ -64,11 +69,12 @@ end
 # Examples:
 # - the "home_screen" "title" element "text" should equal "Home"
 # - "home_screen" "title" element "text" should not equal "About"
+# - "home_screen" "menu_modal" "title" element "text" should not equal "About"
 # - the "home_screen" "title" element "text" shouldn't equal "%{saved_value}"
-Then(%r(^(?:the )?"(\w+|%\{\w+\})" "(\w+|%\{\w+\})" element "(\w+|%\{\w+\})" should ?(n't |not )?equal "(\w+|%\{\w+\})"$)) do |*args|
-  screen, element, method, negative, expected_value = AutomationObject::StepDefinitions::Parse.new(args).get
+Then(%r(^(?:the )?"(\w+|%\{\w+\})"\s*"?(\w+|%\{\w+\})?"?\s*"(\w+|%\{\w+\})" element "(\w+|%\{\w+\})" should ?(n't |not )?equal "(\w+|%\{\w+\})"$)) do |*args|
+  screen, modal, element, method, negative, expected_value = AutomationObject::StepDefinitions::Parse.new(args).get
 
-  actual_value = AutomationObject::Framework.get.screen(screen).element(element).send(method)
+  actual_value = AutomationObject::Framework.get.screen(screen).modal(modal).element(element).send(method)
   if negative
     expect(expected_value).not_to eq(actual_value)
   else

data/lib/automation_object/step_definitions/element_array.rb

@@ -9,12 +9,13 @@ require_relative 'support/element_array'
 # - I click on the first "home_screen" "about_button" element array
 # - I hover over all "home_screen" "about_button" element array
 # - I click on 0..9 "home_screen" "about_button" element array
+# - I click on 0..9 "home_screen" "menu_modal" "about_button" element array
 # - I click on a random "home_screen" "about_button" element array
-When(%r(^I (\w+|%\{\w+\})?(?: on| over)?(?: the| a)? (%\{\w+\}|all|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{\w+\})" "(\w+|%\{\w+\})" element array$)) do |*args|
-  method, key, low_range, high_range, screen, element = AutomationObject::StepDefinitions::Parse.new(args).get
+When(%r(^I (\w+|%\{\w+\})?(?: on| over)?(?: the| a)? (%\{\w+\}|all|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{\w+\})"\s*"?(\w+|%\{\w+\})?"?\s*"(\w+|%\{\w+\})" element array$)) do |*args|
+  method, key, low_range, high_range, screen, modal, element = AutomationObject::StepDefinitions::Parse.new(args).get
 
   AutomationObject::StepDefinitions::ElementArray.iterate_and_do(
-    screen, element, key, low_range, high_range
+    screen, modal, element, key, low_range, high_range
   ) do |sub_element|
     sub_element.send(method)
   end
@@ -23,11 +24,12 @@ end
 # For: Type into element array field
 # Examples:
 # - I type "blah" into the first "home_screen" "text_field" element array
-When(%r(^I type "([\w\s]+|%\{\w+\})" in(?:to| to)? (?:the )?(%\{\w+\}|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{\w+\})" "(\w+|%\{\w+\})" element array$)) do |*args|
-  text, key, low_range, high_range, screen, element = AutomationObject::StepDefinitions::Parse.new(args).get
+# - I type "blah" into the first "home_screen" "menu_modal" "text_field" element array
+When(%r(^I type "([\w\s]+|%\{\w+\})" in(?:to| to)? (?:the )?(%\{\w+\}|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{\w+\})"\s*"?(\w+|%\{\w+\})?"?\s*"(\w+|%\{\w+\})" element array$)) do |*args|
+  text, key, low_range, high_range, screen, modal, element = AutomationObject::StepDefinitions::Parse.new(args).get
 
   AutomationObject::StepDefinitions::ElementArray.iterate_and_do(
-    screen, element, key, low_range, high_range
+    screen, modal, element, key, low_range, high_range
   ) do |sub_element|
     sub_element.send_keys(text)
   end
@@ -36,22 +38,24 @@ end
 # For: Scroll 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+\}|all|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{\w+\})" "(\w+|%\{\w+\})" element array$)) do |*args|
-  key, low_range, high_range, screen, element = AutomationObject::StepDefinitions::Parse.new(args).get
+# - I scroll to the first "home_screen" "menu_modal" "logo_button" element array
+When(%r(^I (?:scroll |focus )(?:to |through )(?:the )?(%\{\w+\}|all|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{\w+\})"\s*"?(\w+|%\{\w+\})?"?\s*"(\w+|%\{\w+\})" element array$)) do |*args|
+  key, low_range, high_range, screen, modal, element = AutomationObject::StepDefinitions::Parse.new(args).get
 
   AutomationObject::StepDefinitions::ElementArray.iterate_and_do(
-    screen, element, key, low_range, high_range, &:scroll_into_view
+    screen, modal, element, key, low_range, high_range, &:scroll_into_view
   )
 end
 
 # For: Save 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+\})" as "(\w+)" from (?:the )?(%\{\w+\}|all|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{\w+\})" "(\w+|%\{\w+\})" element array$)) do |*args|
-  method, value_key, key, low_range, high_range, screen, element = AutomationObject::StepDefinitions::Parse.new(args).get
+# - I save "text" as "unique_value" from the first "home_screen" "menu_modal" "logo_button" element array
+When(%r(^I save "(\w+|%\{\w+\})" as "(\w+)" from (?:the )?(%\{\w+\}|all|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{\w+\})"\s*"?(\w+|%\{\w+\})?"?\s*"(\w+|%\{\w+\})" element array$)) do |*args|
+  method, value_key, key, low_range, high_range, screen, modal, element = AutomationObject::StepDefinitions::Parse.new(args).get
 
   AutomationObject::StepDefinitions::ElementArray.iterate_and_do(
-    screen, element, key, low_range, high_range
+    screen, modal, element, key, low_range, high_range
   ) do |sub_element|
     value = sub_element.send(method)
     AutomationObject::StepDefinitions::Cache.set(value_key, value)
@@ -61,10 +65,11 @@ end
 # For: Test the element arrays length
 # Examples:
 # - the "home_screen" "title" element array should be greater than 0
-Then(%r(^(?:the )?"(\w+|%\{\w+\})" "(\w+|%\{\w+\})" 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
+# - the "home_screen" "menu_modal" "title" element array should be greater than 0
+Then(%r(^(?:the )?"(\w+|%\{\w+\})"\s*"?(\w+|%\{\w+\})?"?\s*"(\w+|%\{\w+\})" 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, modal, element, negative, comparison, expected_value = AutomationObject::StepDefinitions::Parse.new(args).get
 
-  element_array = AutomationObject::Framework.get.screen(screen).element_array(element)
+  element_array = AutomationObject::Framework.get.screen(screen).modal(modal).element_array(element)
   assert element_array.is_a?(Array)
 
   if comparison =~ /larger th[ae]n|greater th[ae]n/
@@ -93,13 +98,14 @@ end
 # - the first "home_screen" "title" element array "text" should equal "Home"
 # - the last "home_screen" "title" element array "text" shouldn't equal "Home"
 # - the random "home_screen" "title" element array "text" should not equal "Home"
+# - the random "home_screen" "menu_modal" "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+\})" "(\w+|%\{\w+\})" element array "(\w+|%\{\w+\})" should?(n't| not)? equal "(\w+|%\{\w+\})"$)) do |*args|
-  key, low_range, high_range, screen, element, method, negative, expected_value = AutomationObject::StepDefinitions::Parse.new(args).get
+Then(%r(^(?:the )?(%\{\w+\}|all|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{\w+\})"\s*"?(\w+|%\{\w+\})?"?\s*"(\w+|%\{\w+\})" element array "(\w+|%\{\w+\})" should?(n't| not)? equal "(\w+|%\{\w+\})"$)) do |*args|
+  key, low_range, high_range, screen, modal, element, method, negative, expected_value = AutomationObject::StepDefinitions::Parse.new(args).get
 
   AutomationObject::StepDefinitions::ElementArray.iterate_and_do(
-    screen, element, key, low_range, high_range
+    screen, modal, element, key, low_range, high_range
   ) do |sub_element|
     value = sub_element.send(method)
 
@@ -115,11 +121,12 @@ end
 # Examples:
 # - the "home_screen" "title" element array "text" should be unique
 # - the "home_screen" "title" element array "text" should not be unique
+# - the "home_screen" "menu_modal" "title" element array "text" should not be unique
 # - the "home_screen" "title" element array "text" shouldn't be unique
-Then(%r(^(?:the )?"(\w+|%\{\w+\})" "(\w+|%\{\w+\})" element array "(\w+|%\{\w+\})" should(n't| not)? be unique$)) do |*args|
-  screen, element, method, negative = AutomationObject::StepDefinitions::Parse.new(args).get
+Then(%r(^(?:the )?"(\w+|%\{\w+\})"\s*"?(\w+|%\{\w+\})?"?\s*"(\w+|%\{\w+\})" element array "(\w+|%\{\w+\})" should(n't| not)? be unique$)) do |*args|
+  screen, modal, element, method, negative = AutomationObject::StepDefinitions::Parse.new(args).get
 
-  element_array = AutomationObject::Framework.get.screen(screen).element_array(element)
+  element_array = AutomationObject::Framework.get.screen(screen).modal(modal).element_array(element)
   assert element_array.is_a?(Array)
 
   values = []

data/lib/automation_object/step_definitions/element_hash.rb

@@ -7,11 +7,12 @@ require_relative 'support/element_hash'
 # For: Call an element hash method
 # Examples:
 # - I click on the first "home_screen" "about_button" element hash
-When(%r(^I (\w+|%\{\w+\})?(?: on| over)?(?: the| a)? (%\{\w+\}|all|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{\w+\})" "(\w+|%\{\w+\})" element hash$)) do |*args|
-  method, key, low_range, high_range, screen, element = AutomationObject::StepDefinitions::Parse.new(args).get
+# - I click on the first "home_screen" "menu_modal" "about_button" element hash
+When(%r(^I (\w+|%\{\w+\})?(?: on| over)?(?: the| a)? (%\{\w+\}|all|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{\w+\})"\s*"?(\w+|%\{\w+\})?"?\s*"(\w+|%\{\w+\})" element hash$)) do |*args|
+  method, key, low_range, high_range, screen, modal, element = AutomationObject::StepDefinitions::Parse.new(args).get
 
   AutomationObject::StepDefinitions::ElementHash.iterate_and_do(
-    screen, element, key, low_range, high_range
+    screen, modal, element, key, low_range, high_range
   ) do |sub_element|
     sub_element.send(method)
   end
@@ -20,11 +21,12 @@ end
 # For: Type into element hash field
 # Examples:
 # - I type "blah" into the first "home_screen" "text_field" element hash
-When(%r(^I type "([\w\s]+|%\{\w+\})" in(?:to| to)? (?:the )?(%\{\w+\}|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{\w+\})" "(\w+|%\{\w+\})" element hash$)) do |*args|
-  text, key, low_range, high_range, screen, element = AutomationObject::StepDefinitions::Parse.new(args).get
+# - I type "blah" into the first "home_screen" "menu_modal" "text_field" element hash
+When(%r(^I type "([\w\s]+|%\{\w+\})" in(?:to| to)? (?:the )?(%\{\w+\}|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{\w+\})"\s*"?(\w+|%\{\w+\})?"?\s*"(\w+|%\{\w+\})" element hash$)) do |*args|
+  text, key, low_range, high_range, screen, modal, element = AutomationObject::StepDefinitions::Parse.new(args).get
 
   AutomationObject::StepDefinitions::ElementHash.iterate_and_do(
-    screen, element, key, low_range, high_range
+    screen, modal, element, key, low_range, high_range
   ) do |sub_element|
     sub_element.send_keys(text)
   end
@@ -33,22 +35,24 @@ end
 # For: Scroll 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+\}|all|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{\w+\})" "(\w+|%\{\w+\})" element hash$)) do |*args|
-  key, low_range, high_range, screen, element = AutomationObject::StepDefinitions::Parse.new(args).get
+# - I scroll to the first "home_screen" "menu_modal" "logo_button" element hash
+When(%r(^I (?:scroll |focus )(?:to |through )(?:the )?(%\{\w+\}|all|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{\w+\})"\s*"?(\w+|%\{\w+\})?"?\s*"(\w+|%\{\w+\})" element hash$)) do |*args|
+  key, low_range, high_range, screen, modal, element = AutomationObject::StepDefinitions::Parse.new(args).get
 
   AutomationObject::StepDefinitions::ElementHash.iterate_and_do(
-    screen, element, key, low_range, high_range, &:scroll_into_view
+    screen, modal, element, key, low_range, high_range, &:scroll_into_view
   )
 end
 
 # For: Save 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+\})" as "(\w+)" from (?:the )?(%\{\w+\}|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{\w+\})" "(\w+|%\{\w+\})" element hash$)) do |*args|
-  method, value_key, key, low_range, high_range, screen, element = AutomationObject::StepDefinitions::Parse.new(args).get
+# - I save "text" as "unique_value" from the first "home_screen" "menu_modal" "logo_button" element hash
+When(%r(^I save "(\w+|%\{\w+\})" as "(\w+)" from (?:the )?(%\{\w+\}|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{\w+\})"\s*"?(\w+|%\{\w+\})?"?\s*"(\w+|%\{\w+\})" element hash$)) do |*args|
+  method, value_key, key, low_range, high_range, screen, modal, element = AutomationObject::StepDefinitions::Parse.new(args).get
 
   AutomationObject::StepDefinitions::ElementHash.iterate_and_do(
-    screen, element, key, low_range, high_range
+    screen, modal, element, key, low_range, high_range
   ) do |sub_element|
     value = sub_element.send(method)
     AutomationObject::StepDefinitions::Cache.set(value_key, value)
@@ -58,10 +62,11 @@ end
 # For: Test the element hashes size
 # Examples:
 # - the "home_screen" "title" element hash should be greater than 0
-Then(%r(^(?:the )?"(\w+|%\{\w+\})" "(\w+|%\{\w+\})" 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
+# - the "home_screen" "menu_modal" "title" element hash should be greater than 0
+Then(%r(^(?:the )?"(\w+|%\{\w+\})"\s*"?(\w+|%\{\w+\})?"?\s*"(\w+|%\{\w+\})" 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, modal, element, negative, comparison, expected_value = AutomationObject::StepDefinitions::Parse.new(args).get
 
-  element_hash = AutomationObject::Framework.get.screen(screen).element_hash(element)
+  element_hash = AutomationObject::Framework.get.screen(screen).modal(modal).element_hash(element)
   assert element_hash.is_a?(Hash)
 
   if comparison =~ /larger th[ae]n|greater th[ae]n/
@@ -88,11 +93,12 @@ end
 # For: Test 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+\})" "(\w+|%\{\w+\})" element hash "(\w+|%\{\w+\})" should ?(n't |not )?equal "(\w+|%\{\w+\})"$)) do |*args|
-  key, low_range, high_range, screen, element, method, negative, expected_value = AutomationObject::StepDefinitions::Parse.new(args).get
+# - the first "home_screen" "menu_modal" "title" element hash "text" should equal "Home"
+Then(%r(^(?:the )?(%\{\w+\}|random|last|first|(\d+)\.\.(\d+)) "(\w+|%\{\w+\})"\s*"?(\w+|%\{\w+\})?"?\s*"(\w+|%\{\w+\})" element hash "(\w+|%\{\w+\})" should ?(n't |not )?equal "(\w+|%\{\w+\})"$)) do |*args|
+  key, low_range, high_range, screen, modal, element, method, negative, expected_value = AutomationObject::StepDefinitions::Parse.new(args).get
 
   AutomationObject::StepDefinitions::ElementHash.iterate_and_do(
-    screen, element, key, low_range, high_range
+    screen, modal, element, key, low_range, high_range
   ) do |sub_element|
     value = sub_element.send(method)
 
@@ -107,10 +113,11 @@ end
 # For: Test if the element hash is unique
 # Examples:
 # - the "home_screen" "title" element hash "text" should be unique
-Then(%r(^(?:the )?"(\w+|%\{\w+\})" "(\w+|%\{\w+\})" element hash "(\w+|%\{\w+\})" should(n't|not)? be unique$)) do |*args|
-  screen, element, method, negative = AutomationObject::StepDefinitions::Parse.new(args).get
+# - the "home_screen" "menu_modal" "title" element hash "text" should be unique
+Then(%r(^(?:the )?"(\w+|%\{\w+\})"\s*"?(\w+|%\{\w+\})?"?\s*"(\w+|%\{\w+\})" element hash "(\w+|%\{\w+\})" should(n't|not)? be unique$)) do |*args|
+  screen, modal, element, method, negative = AutomationObject::StepDefinitions::Parse.new(args).get
 
-  element_hash = AutomationObject::Framework.get.screen(screen).element_hash(element)
+  element_hash = AutomationObject::Framework.get.screen(screen).modal(modal).element_hash(element)
   assert element_hash.is_a?(Hash)
 
   values = []