testcentricity_apps 4.0.15 → 4.1.0

data/lib/testcentricity_apps/app_core/appium_connect_helper.rb

@@ -7,11 +7,7 @@ require 'uri'
 
 module TestCentricity
   module AppiumConnect
-    attr_accessor :driver
-    attr_accessor :running
-    attr_accessor :endpoint
-    attr_accessor :capabilities
-    attr_accessor :global_scope
+    attr_accessor :driver, :running, :endpoint, :capabilities, :global_scope
 
     # Create a new driver instance with capabilities specified in the options parameter, or via Environment Variables.
     # Refer to the `Connecting to a Mobile Simulator or Device` section of the ruby docs for this gem.
@@ -50,6 +46,7 @@ module TestCentricity
                       appium_local_capabilities
                     when :custom
                       raise 'User-defined cloud driver requires that you define options' if options.nil?
+
                       custom_capabilities
                     when :browserstack
                       browserstack_capabilities
@@ -75,9 +72,7 @@ module TestCentricity
       Appium.promote_appium_methods(TestCentricity::AppElements::AppUIElement, driver = @driver)
 
       Environ.screen_size = window_size
-      unless Environ.driver_name
-        Environ.driver_name = "#{Environ.driver}_#{Environ.device_os}_#{Environ.device_type}".downcase.to_sym
-      end
+      Environ.driver_name = "#{Environ.driver}_#{Environ.device_os}_#{Environ.device_type}".downcase.to_sym unless Environ.driver_name
       Environ.session_state = :running
     end
 
@@ -328,11 +323,9 @@ module TestCentricity
     end
 
     def self.biometric_match(type, match)
-      if Environ.is_ios?
-        @driver.execute_script('mobile: sendBiometricMatch', { type: type, match: match })
-      else
-        raise 'biometric_match is not supported for this platform'
-      end
+      raise 'biometric_match is not supported for this platform' unless Environ.is_ios?
+
+      @driver.execute_script('mobile: sendBiometricMatch', { type: type, match: match })
     end
 
     # :nocov:
@@ -365,7 +358,7 @@ module TestCentricity
                   end
 
       request = Net::HTTP::Post.new(url)
-      boundary = "WebAppBoundary"
+      boundary = 'WebAppBoundary'
       post_body = []
       post_body << "--#{boundary}\r\n"
       post_body << "Content-Disposition: form-data; name=\"file\"; filename=\"#{file_path}\"\r\n"
@@ -380,7 +373,7 @@ module TestCentricity
       end
       post_body << "\r\n--#{boundary}--\r\n"
       request.body = post_body.join
-      request["Content-Type"] = "multipart/form-data; boundary=#{boundary}"
+      request['Content-Type'] = "multipart/form-data; boundary=#{boundary}"
       request.basic_auth(user_id, auth_key)
       # send the request to upload to cloud service provider
       uri = URI.parse(url)
@@ -391,18 +384,17 @@ module TestCentricity
       end
       response = conn.request(request)
       result = JSON.parse(response.body)
-      if response.code.to_i > 202
-        raise "An error has occurred while attempting to upload #{file_path} to the #{service} service\n#{result}"
-      else
-        puts "Successfully uploaded #{file_path} to the #{service} service\n#{result}"
-      end
-     end
+      raise "An error has occurred while attempting to upload #{file_path} to the #{service} service\n#{result}" if response.code.to_i > 202
+
+      puts "Successfully uploaded #{file_path} to the #{service} service\n#{result}"
+    end
     # :nocov:
 
     private
 
     def self.get_app_id(bundle_id = nil)
       return bundle_id unless bundle_id.nil?
+
       case
       when Environ.is_ios?
         Environ.current.ios_bundle_id
@@ -442,11 +434,11 @@ module TestCentricity
         if ENV['LOCALE'] && ENV['LANGUAGE']
           caps[:'appium:language'] = ENV['LANGUAGE']
           caps[:'appium:locale'] = if Environ.is_android?
-                            locale = ENV['LOCALE'].gsub('-', '_')
-                            locale.split('_')[1]
-                          else
-                            ENV['LOCALE'].gsub('-', '_')
-                          end
+                                     locale = ENV['LOCALE'].gsub('-', '_')
+                                     locale.split('_')[1]
+                                   else
+                                     ENV['LOCALE'].gsub('-', '_')
+                                   end
         end
         caps[:'appium:newCommandTimeout'] = ENV['NEW_COMMAND_TIMEOUT'] if ENV['NEW_COMMAND_TIMEOUT']
         caps[:'appium:noReset'] = ENV['APP_NO_RESET'] if ENV['APP_NO_RESET']
@@ -480,16 +472,16 @@ module TestCentricity
         end
 
         caps[:'appium:app'] = if ENV['APP']
-                       ENV['APP']
-                     else
-                       if Environ.is_android?
-                         Environ.current.android_apk_path
-                       elsif Environ.is_ios?
-                         Environ.is_device? ?
-                           Environ.current.ios_ipa_path :
-                           Environ.current.ios_app_path
-                       end
-        end
+                                ENV['APP']
+                              else
+                                if Environ.is_android?
+                                  Environ.current.android_apk_path
+                                elsif Environ.is_ios?
+                                  Environ.is_device? ?
+                                    Environ.current.ios_ipa_path :
+                                    Environ.current.ios_app_path
+                                end
+                              end
         caps
       else
         Environ.device_os = @capabilities[:platformName]
@@ -543,7 +535,7 @@ module TestCentricity
                   bs_options[:gpsLocation] = ENV['GPS_LOCATION'] if ENV['GPS_LOCATION']
                   bs_options[:acceptInsecureCerts] = ENV['ACCEPT_INSECURE_CERTS'] if ENV['ACCEPT_INSECURE_CERTS']
                   bs_options[:disableAnimations] = ENV['DISABLE_ANIMATION'] if ENV['DISABLE_ANIMATION']
-                  bs_options[:appiumVersion] = ENV['APPIUM_VERSION'] ? ENV['APPIUM_VERSION'] : '2.6.0'
+                  bs_options[:appiumVersion] = ENV['APPIUM_VERSION'] ? ENV['APPIUM_VERSION'] : '2.19.0'
 
                   capabilities = {
                     platformName: ENV['BS_OS'],
@@ -568,7 +560,6 @@ module TestCentricity
       options
     end
 
-    # :nocov:
     def self.testingbot_capabilities
       Environ.device = :simulator
       # specify endpoint url
@@ -587,7 +578,7 @@ module TestCentricity
                   tb_options['testingbot.geoCountryCode'] = ENV['IP_GEOLOCATION'] if ENV['IP_GEOLOCATION']
                   tb_options[:screenrecorder] = ENV['RECORD_VIDEO'] if ENV['RECORD_VIDEO']
                   tb_options[:screenshot] = ENV['SCREENSHOTS'] if ENV['SCREENSHOTS']
-                  tb_options[:appiumVersion] = ENV['APPIUM_VERSION'] ? ENV['APPIUM_VERSION'] : '2.10.3'
+                  tb_options[:appiumVersion] = ENV['APPIUM_VERSION'] ? ENV['APPIUM_VERSION'] : 'latest'
 
                   capabilities = {
                     platformName: ENV['TB_OS'],
@@ -613,40 +604,37 @@ module TestCentricity
       options
     end
 
+    # :nocov:
     def self.sauce_capabilities
       # specify endpoint url
-      if @endpoint.nil?
-        @endpoint = "https://#{ENV['SL_USERNAME']}:#{ENV['SL_AUTHKEY']}@ondemand.#{ENV['SL_DATA_CENTER']}.saucelabs.com:443/wd/hub"
-      end
+      @endpoint = "https://#{ENV['SL_USERNAME']}:#{ENV['SL_AUTHKEY']}@ondemand.#{ENV['SL_DATA_CENTER']}.saucelabs.com:443/wd/hub" if @endpoint.nil?
       # define SauceLabs options
-      options = if @capabilities.nil?
-                  Environ.device_name = ENV['SL_DEVICE']
-                  Environ.device_os = ENV['SL_OS']
-                  Environ.device_os_version = ENV['SL_OS_VERSION']
-                  # define the required set of SauceLabs options
-                  sl_options = { build: test_context_message }
-                  # define the optional SauceLabs options
-                  sl_options[:name] = ENV['AUTOMATE_PROJECT'] if ENV['AUTOMATE_PROJECT']
-                  sl_options[:deviceOrientation] = ENV['ORIENTATION'].upcase if ENV['ORIENTATION']
-                  sl_options[:recordVideo] = ENV['RECORD_VIDEO'] if ENV['RECORD_VIDEO']
-                  sl_options[:recordScreenshots] = ENV['SCREENSHOTS'] if ENV['SCREENSHOTS']
-                  sl_options[:appiumVersion] = ENV['APPIUM_VERSION'] ? ENV['APPIUM_VERSION'] : '2.1.3'
-                  capabilities = {
-                    platformName: ENV['SL_OS'],
-                    'appium:platformVersion': ENV['SL_OS_VERSION'],
-                    'appium:deviceName': ENV['SL_DEVICE'],
-                    'appium:automationName': ENV['AUTOMATION_ENGINE'],
-                    'appium:app': ENV['APP'],
-                    'sauce:options': sl_options
-                  }
-                  capabilities
-                else
-                  Environ.device_os = @capabilities[:platformName]
-                  Environ.device_name = @capabilities[:'appium:deviceName']
-                  Environ.device_os_version = @capabilities[:'appium:platformVersion']
-                  @capabilities
-                end
-      options
+      if @capabilities.nil?
+        Environ.device_name = ENV['SL_DEVICE']
+        Environ.device_os = ENV['SL_OS']
+        Environ.device_os_version = ENV['SL_OS_VERSION']
+        # define the required set of SauceLabs options
+        sl_options = { build: test_context_message }
+        # define the optional SauceLabs options
+        sl_options[:name] = ENV['AUTOMATE_PROJECT'] if ENV['AUTOMATE_PROJECT']
+        sl_options[:deviceOrientation] = ENV['ORIENTATION'].upcase if ENV['ORIENTATION']
+        sl_options[:recordVideo] = ENV['RECORD_VIDEO'] if ENV['RECORD_VIDEO']
+        sl_options[:recordScreenshots] = ENV['SCREENSHOTS'] if ENV['SCREENSHOTS']
+        sl_options[:appiumVersion] = ENV['APPIUM_VERSION'] ? ENV['APPIUM_VERSION'] : '2.1.3'
+        {
+          platformName: ENV['SL_OS'],
+          'appium:platformVersion': ENV['SL_OS_VERSION'],
+          'appium:deviceName': ENV['SL_DEVICE'],
+          'appium:automationName': ENV['AUTOMATION_ENGINE'],
+          'appium:app': ENV['APP'],
+          'sauce:options': sl_options
+        }
+      else
+        Environ.device_os = @capabilities[:platformName]
+        Environ.device_name = @capabilities[:'appium:deviceName']
+        Environ.device_os_version = @capabilities[:'appium:platformVersion']
+        @capabilities
+      end
     end
 
     def self.test_context_message

data/lib/testcentricity_apps/app_core/screen_object.rb

@@ -8,6 +8,7 @@ module TestCentricity
 
     def initialize
       raise "Screen object #{self.class.name} does not have a screen_name trait defined" unless defined?(screen_name)
+
       @locator = screen_locator if defined?(screen_locator)
     end
 
@@ -236,6 +237,30 @@ module TestCentricity
       end
     end
 
+    # Declare and instantiate a single table UI Element for this screen object.
+    #
+    # @param element_name [Symbol] name of table object (as a symbol)
+    # @param locator [Hash] { locator_strategy: locator_identifier }
+    # @example
+    #   table :sidebar_table, { predicate: 'identifier == "library.sidebar"' }
+    #
+    def self.table(element_name, locator)
+      define_screen_element(element_name, TestCentricity::AppElements::AppTable, locator)
+    end
+
+    # Declare and instantiate a collection of tables for this screen object.
+    #
+    # @param element_hash [Hash] names of tables (as symbol) and locator Hash
+    # @example
+    #   tables sidebar_table: { predicate: 'identifier == "library.sidebar"' },
+    #          view_table:    { predicate: 'identifier == "view.library.table"' }
+    #
+    def self.tables(element_hash)
+      element_hash.each do |element_name, locator|
+        table(element_name, locator)
+      end
+    end
+
     # Declare and instantiate a single image UI Element for this screen object.
     #
     # @param element_name [Symbol] name of image object (as a symbol)
@@ -285,6 +310,30 @@ module TestCentricity
       end
     end
 
+    # Declare and instantiate a single menu UI Element for this screen object.
+    #
+    # @param element_name [Symbol] name of menu object (as a symbol)
+    # @param locator [Hash] { locator_strategy: locator_identifier }
+    # @example
+    #   menu :convert_menu, { xpath: '//XCUIElementTypeMenuBarItem[6]' }
+    #
+    def self.menu(element_name, locator)
+      define_screen_element(element_name, TestCentricity::AppElements::AppMenu, locator)
+    end
+
+    # Declare and instantiate a collection of menus for this screen object.
+    #
+    # @param element_hash [Hash] names of menus (as symbol) and locator Hash
+    # @example
+    #   menus convert_menu: { xpath: '//XCUIElementTypeMenuBarItem[6]' },
+    #         view_menu:    { xpath: '//XCUIElementTypeMenuBarItem[5]' }
+    #
+    def self.menus(element_hash)
+      element_hash.each do |element_name, locator|
+        menu(element_name, locator)
+      end
+    end
+
     # Declare and instantiate a single MenuBar object for this screen object.
     #
     # @param element_name [Symbol] name of MenuBar object (as a symbol)
@@ -327,7 +376,7 @@ module TestCentricity
     #   home_screen.exists?
     #
     def exists?
-      @locator.is_a?(Array) ? tries ||= 2 : tries ||= 1
+      tries ||= @locator.is_a?(Array) ? 2 : 1
       if @locator.is_a?(Array)
         loc = @locator[tries - 1]
         find_element(loc.keys[0], loc.values[0])
@@ -336,7 +385,7 @@ module TestCentricity
       end
       true
     rescue
-      retry if (tries -= 1) > 0
+      retry if (tries -= 1).positive?
       false
     end
 
@@ -347,19 +396,15 @@ module TestCentricity
     #   calculator_screen.title
     #
     def title
-      if Environ.is_macos?
-        find_element(@locator.keys[0], @locator.values[0]).title
-      else
-        raise 'title is not a supported attribute'
-      end
+      raise 'title is not a supported attribute' unless Environ.is_macos?
+
+      find_element(@locator.keys[0], @locator.values[0]).title
     end
 
     def identifier
-      if Environ.is_macos?
-        find_element(@locator.keys[0], @locator.values[0]).identifier
-      else
-        raise 'identifier is not a supported attribute'
-      end
+      raise 'identifier is not a supported attribute' unless Environ.is_macos?
+
+      find_element(@locator.keys[0], @locator.values[0]).identifier
     end
 
     # Wait until the Screen object exists, or until the specified wait time has expired. If the wait time is nil, then
@@ -477,6 +522,7 @@ module TestCentricity
         ivar_name = "@#{element_name}"
         ivar = instance_variable_get(ivar_name)
         return ivar if ivar
+
         instance_variable_set(ivar_name, obj.new(element_name, self, locator, :screen))
       end
     end

data/lib/testcentricity_apps/app_core/screen_objects_helper.rb

@@ -47,24 +47,25 @@ module TestCentricity
     #       security_code_field => UserData.current.cvv
     #     }
     #     populate_data_fields(fields)
+    #
     def populate_data_fields(data, wait_time = nil)
       timeout = wait_time.nil? ? 2 : wait_time
       data.each do |data_field, data_param|
-        unless data_param.blank?
-          # make sure the intended UI target element is visible before trying to set its value
-          data_field.scroll_into_view unless data_field.wait_until_visible(timeout, post_exception = false)
-          if data_param == '!DELETE'
+        next if data_param.blank?
+
+        # make sure the intended UI target element is visible before trying to set its value
+        data_field.scroll_into_view unless data_field.wait_until_visible(timeout, post_exception = false)
+        if data_param == '!DELETE'
+          data_field.clear
+        else
+          case data_field.get_object_type
+          when :checkbox
+            data_field.set_checkbox_state(data_param.to_bool)
+          when :radio
+            data_field.set_selected_state(data_param.to_bool)
+          when :textfield
             data_field.clear
-          else
-            case data_field.get_object_type
-            when :checkbox
-              data_field.set_checkbox_state(data_param.to_bool)
-            when :radio
-              data_field.set_selected_state(data_param.to_bool)
-            when :textfield
-              data_field.clear
-              data_field.set(data_param)
-            end
+            data_field.set(data_param)
           end
         end
       end
@@ -111,6 +112,12 @@ module TestCentricity
                      ui_object.read_only?
                    when :maxlength
                      ui_object.get_max_length
+                   when :rowcount
+                     ui_object.get_row_count
+                   when :columncount
+                     ui_object.get_column_count
+                   when :column_headers
+                     ui_object.get_header_columns
                    when :items
                      ui_object.get_list_items
                    when :itemcount
@@ -143,6 +150,12 @@ module TestCentricity
                            ui_object.get_item_enabled(value.to_i)
                          when :item_data
                            ui_object.get_item_data(value.to_i)
+                         when :row
+                           ui_object.get_table_row(value.to_i)
+                         when :column
+                           ui_object.get_table_column(value.to_i)
+                         when :cell
+                           ui_object.get_table_cell(value[0].to_i, value[1].to_i)
                          else
                            raise "#{key} is not a valid property key"
                          end
@@ -176,7 +189,8 @@ module TestCentricity
     #   swipe_gesture(direction = :down, distance = 1)
     #
     def swipe_gesture(direction, distance = 0.5)
-      raise 'Scroll distance must be between 0 and 1' if (distance < 0 || distance > 1)
+      raise 'Scroll distance must be between 0 and 1' if distance.negative? || distance > 1
+
       size = window_size
       mid_pt = [(size.width * 0.5).to_i, (size.height * 0.5).to_i]
       top = (mid_pt[1] - ((size.height * distance) * 0.5)).to_i

data/lib/testcentricity_apps/app_core/screen_section.rb

@@ -5,10 +5,7 @@ module TestCentricity
     include Test::Unit::Assertions
 
     attr_reader   :context, :name
-    attr_accessor :locator
-    attr_accessor :parent
-    attr_accessor :parent_list
-    attr_accessor :list_index
+    attr_accessor :locator, :parent, :parent_list, :list_index
 
     def initialize(name, parent, locator, context)
       @name        = name
@@ -58,6 +55,7 @@ module TestCentricity
 
     def get_item_count
       raise 'No parent list defined' if @parent_list.nil?
+
       @parent_list.get_item_count
     end
 
@@ -294,6 +292,28 @@ module TestCentricity
       element_hash.each_pair { |element_name, locator| selectlist(element_name, locator) }
     end
 
+    # Declare and instantiate a single table UI Element for this screen section object.
+    #
+    # @param element_name [Symbol] name of table object (as a symbol)
+    # @param locator [Hash] { locator_strategy: locator_identifier }
+    # @example
+    #   table :sidebar_table, { predicate: 'identifier == "library.sidebar"' }
+    #
+    def self.table(element_name, locator)
+      define_section_element(element_name, TestCentricity::AppElements::AppTable, locator)
+    end
+
+    # Declare and instantiate a collection of tables for this screen section object.
+    #
+    # @param element_hash [Hash] names of tables (as symbol) and locator Hash
+    # @example
+    #   tables sidebar_table: { predicate: 'identifier == "library.sidebar"' },
+    #          view_table:    { predicate: 'identifier == "view.library.table"' }
+    #
+    def self.tables(element_hash)
+      element_hash.each_pair { |element_name, locator| table(element_name, locator) }
+    end
+
     # Declare and instantiate a single image UI Element for this screen section object.
     #
     # @param element_name [Symbol] name of image object (as a symbol)
@@ -316,6 +336,28 @@ module TestCentricity
       element_hash.each_pair { |element_name, locator| image(element_name, locator) }
     end
 
+    # Declare and instantiate a single menu UI Element for this ScreenSection object.
+    #
+    # @param element_name [Symbol] name of menu object (as a symbol)
+    # @param locator [Hash] { locator_strategy: locator_identifier }
+    # @example
+    #   menu :convert_menu, { xpath: '//XCUIElementTypeMenuBarItem[6]' }
+    #
+    def self.menu(element_name, locator)
+      define_section_element(element_name, TestCentricity::AppElements::AppMenu, locator)
+    end
+
+    # Declare and instantiate a collection of menus for this ScreenSection object.
+    #
+    # @param element_hash [Hash] names of menus (as symbol) and locator Hash
+    # @example
+    #   menus convert_menu: { xpath: '//XCUIElementTypeMenuBarItem[6]' },
+    #         view_menu:    { xpath: '//XCUIElementTypeMenuBarItem[5]' }
+    #
+    def self.menus(element_hash)
+      element_hash.each_pair { |element_name, locator| menu(element_name, locator) }
+    end
+
     # Instantiate a single ScreenSection object within this ScreenSection object.
     #
     # @param section_name [Symbol] name of ScreenSection object (as a symbol)
@@ -405,6 +447,7 @@ module TestCentricity
     #
     def scroll_into_view(scroll_mode = :vertical)
       return if visible?
+
       obj = element
       object_not_found_exception(obj)
       driver.action.move_to(obj).perform
@@ -424,12 +467,12 @@ module TestCentricity
         swipe_gesture(direction, distance = 0.2)
         try_count -= 1
         if try_count.zero?
-          if direction == end_direction
-            break
-          else
+          break if direction == end_direction
+            
+          
             direction = end_direction
             try_count = 8
-          end
+          
         end
       end
     end
@@ -476,6 +519,7 @@ module TestCentricity
     def visible?
       section = find_section
       return false if section.nil?
+
       section.displayed?
     end
 
@@ -490,13 +534,11 @@ module TestCentricity
     end
 
     def identifier
-      if Environ.is_macos?
-        section = find_section
-        section_not_found_exception(section)
-        section.identifier
-      else
-        raise 'identifier is not a supported attribute'
-      end
+      raise 'identifier is not a supported attribute' unless Environ.is_macos?
+
+      section = find_section
+      section_not_found_exception(section)
+      section.identifier
     end
 
     # Send keystrokes to this section object.
@@ -641,11 +683,11 @@ module TestCentricity
       obj = nil
       locators = get_locator
       locators.each do |loc|
-        if obj.nil?
-          obj = find_element(loc.keys[0], loc.values[0])
-        else
-          obj = obj.find_element(loc.keys[0], loc.values[0])
-        end
+        obj = if obj.nil?
+                find_element(loc.keys[0], loc.values[0])
+              else
+                obj.find_element(loc.keys[0], loc.values[0])
+              end
         puts "Found section object #{loc}" if ENV['DEBUG']
       end
       obj
@@ -662,6 +704,7 @@ module TestCentricity
         ivar_name = "@#{element_name}"
         ivar = instance_variable_get(ivar_name)
         return ivar if ivar
+
         instance_variable_set(ivar_name, obj.new(element_name, self, locator, :section))
       end
     end

data/lib/testcentricity_apps/app_elements/alert.rb

@@ -38,10 +38,10 @@ module TestCentricity
         reset_mru_cache
         alert_accept
         wait_until_gone(seconds = 5, post_exception = false)
-        if visible?
-          alert_accept
-          wait_until_gone(5)
-        end
+        return unless visible?
+
+        alert_accept
+        wait_until_gone(5)
       end
 
       # Performs the action required dismiss the currently visible alert modal. If the alert modal is still visible after
@@ -54,10 +54,10 @@ module TestCentricity
         reset_mru_cache
         alert_dismiss
         wait_until_gone(seconds = 5, post_exception = false)
-        if visible?
-          alert_dismiss
-          wait_until_gone(5)
-        end
+        return unless visible?
+
+        alert_dismiss
+        wait_until_gone(5)
       end
 
       #