testcentricity 2.3.19 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8046d5d0ef0d140f8236192547ae759e4a01d8d5
-  data.tar.gz: d58ddbc8a4065f42dbd6be3faeb02f2b483208a0
+  metadata.gz: bec8539d0e9b7b3442baf37b6ad6dfa0127f1098
+  data.tar.gz: 92f2cbb4725151a936056835745029b93bf1e2be
 SHA512:
-  metadata.gz: eeb9e89b65774488523144e1c9754a6cdd8e8c14b1918965ae52085c4a9636fd24688e1e509dd933026b1c67fc306225cc476643b3d668b99643c99a555167b7
-  data.tar.gz: 5c6e2de2fe6426af1887cc7e657008af6df80e9409c6413bb0c96009ac1f00d7a7844eacd6d7905c7a5dd1100d2aeda9250bf612e57db39273f16299ed058fd3
+  metadata.gz: a00a9c37aaeb50c688cc39be27f37e3505db5f410bab9595fd1b3f68aa6ed205febf1a402c2191f4ebb21d13bb3a2ac8ab109c676b6e0b87d690b9016014d5ee
+  data.tar.gz: f134665182d8ffa55f92cb699eb68ad1ff76245214f15f10eaf748ba96abb18f1dcf781b8cdc8ab9371bc26b5c66e968dfcdbbd5c9f2e18f3b05c930222a1cb8

data/README.md

@@ -28,6 +28,12 @@ hosted instances of Chrome, Firefox, Safari, and IE web browsers.
 
 
 ## What's New
+###Version 2.4.0
+
+* Updated `TestCentricity::WebDriverConnect.initialize_web_driver` method to read the `APP_FULL_RESET`, `APP_NO_RESET`, and `NEW_COMMAND_TIMEOUT` Environment
+Variables and set the corresponding `fullReset`, `noReset`, and `newCommandTimeout` Appium capabilities for iOS and Android physical devices and simulators.
+Also reads the `WDA_LOCAL_PORT` Environment Variable and sets the `wdaLocalPort` Appium capability for iOS physical devices only.
+
 ###Version 2.3.18
 
 * Updated `SelectList.define_list_elements` method to accept value for `:list_trigger` element.
@@ -985,10 +991,13 @@ Once your test environment is properly configured, the following **Environment V
 `APP_ALLOW_POPUPS`  | [Optional] Allow javascript to open new windows in Safari. Set to `true` or `false`
 `APP_IGNORE_FRAUD_WARNING` | [Optional] Prevent Safari from showing a fraudulent website warning. Set to `true` or `false`
 `APP_NO_RESET`      | [Optional] Don't reset app state after each test. Set to `true` or `false`
+`APP_FULL_RESET`    | [Optional] Perform a complete reset. Set to `true` or `false`
 `APP_INITIAL_URL`   | [Optional] Initial URL, default is a local welcome page.  e.g.  `http://www.apple.com`
+`WDA_LOCAL_PORT`    | [Optional] Used to forward traffic from Mac host to real iOS devices over USB. Default value is same as port number used by WDA on device.
 `LOCALE`            | [Optional] Locale to set for the simulator.  e.g.  `fr_CA`
 `LANGUAGE`          | [Optional] Language to set for the simulator.  e.g.  `fr`
 `ORIENTATION`       | [Optional] Set to `portrait` or `landscape` (only for iOS simulators)
+`NEW_COMMAND_TIMEOUT` | [Optional] Time (in Seconds) that Appium will wait for a new command from the client
 
 
 ### Mobile Chrome or Android browsers on Android Studio Virtual Device emulators
@@ -1013,8 +1022,12 @@ Once your test environment is properly configured, the following **Environment V
 `DEVICE_TYPE`       | Must be set to `phone` or `tablet`
 `ORIENTATION`       | [Optional] Set to `portrait` or `landscape`
 `APP_INITIAL_URL`   | [Optional] Initial URL, default is a local welcome page.  e.g.  `http://www.apple.com`
+`APP_NO_RESET`      | [Optional] Don't reset app state after each test. Set to `true` or `false`
+`APP_FULL_RESET`    | [Optional] Perform a complete reset. Set to `true` or `false`
 `LOCALE`            | [Optional] Locale to set for the simulator.  e.g.  `fr_CA`
 `LANGUAGE`          | [Optional] Language to set for the simulator.  e.g.  `fr`
+`NEW_COMMAND_TIMEOUT` | [Optional] Time (in Seconds) that Appium will wait for a new command from the client
+`CHROMEDRIVER_EXECUTABLE` | [Optional] Absolute local path to webdriver executable
 
 
 ### Remotely hosted desktop and mobile web browsers

data/lib/testcentricity/app_core/appium_connect_helper.rb

@@ -11,57 +11,97 @@ module TestCentricity
       Environ.platform    = :mobile
       Environ.driver      = :appium
       Environ.device_type = ENV['DEVICE_TYPE'] if ENV['DEVICE_TYPE']
+      Environ.device_orientation = ENV['ORIENTATION'] if ENV['ORIENTATION']
 
       @config_file = project_path
 
       if project_path.nil?
-        Environ.device_name = ENV['APP_DEVICE']
-        Environ.device_os   = ENV['APP_PLATFORM_NAME']
-        Environ.device_orientation = ENV['ORIENTATION'] if ENV['ORIENTATION']
-        ENV['UDID'] ? Environ.device = :device : Environ.device = :simulator
+        browser = ENV['WEB_BROWSER']
+        case browser.downcase.to_sym
+        when :appium
+          Environ.device_name = ENV['APP_DEVICE']
+          Environ.device_os   = ENV['APP_PLATFORM_NAME']
+          ENV['UDID'] ? Environ.device = :device : Environ.device = :simulator
+        when :browserstack
+          Environ.device_name = ENV['BS_DEVICE']
+          Environ.device_os   = ENV['BS_OS']
+        end
       end
       @running = false
     end
 
     def self.start_driver
       if @config_file.nil?
-        desired_capabilities = {
-            caps: {
-                platformName:    ENV['APP_PLATFORM_NAME'],
-                platformVersion: ENV['APP_VERSION'],
-                deviceName:      ENV['APP_DEVICE'],
-                automationName:  ENV['AUTOMATION_ENGINE']
-            }
-        }
-        capabilities = desired_capabilities[:caps]
-        capabilities[:avd] = ENV['APP_DEVICE'] if ENV['APP_PLATFORM_NAME'].downcase.to_sym == :android
-        capabilities[:orientation] = ENV['ORIENTATION'].upcase if ENV['ORIENTATION']
-        capabilities[:language] = ENV['LANGUAGE'] if ENV['LANGUAGE']
-        capabilities[:locale] = ENV['LOCALE'].gsub('-', '_') if ENV['LOCALE']
-        capabilities[:newCommandTimeout] = ENV['NEW_COMMAND_TIMEOUT'] if ENV['NEW_COMMAND_TIMEOUT']
-        capabilities[:noReset] = ENV['APP_NO_RESET'] if ENV['APP_NO_RESET']
-        capabilities[:fullReset] = ENV['APP_FULL_RESET'] if ENV['APP_FULL_RESET']
-        if ENV['UDID']
-          capabilities[:udid] = ENV['UDID']
-          capabilities[:bundleId] = ENV['BUNDLE_ID'] if ENV['BUNDLE_ID']
-          capabilities[:xcodeOrgId] = ENV['TEAM_ID'] if ENV['TEAM_ID']
-          capabilities[:xcodeSigningId] = ENV['TEAM_NAME'] if ENV['TEAM_NAME']
-          capabilities[:appActivity] = ENV['APP_ACTIVITY'] if ENV['APP_ACTIVITY']
-          capabilities[:appPackage] = ENV['APP_PACKAGE'] if ENV['APP_PACKAGE']
-        end
+        browser = ENV['WEB_BROWSER']
+        case browser.downcase.to_sym
+        when :appium
+          desired_capabilities = {
+              caps: {
+                  platformName:    ENV['APP_PLATFORM_NAME'],
+                  platformVersion: ENV['APP_VERSION'],
+                  deviceName:      ENV['APP_DEVICE'],
+                  automationName:  ENV['AUTOMATION_ENGINE']
+              }
+          }
+          capabilities = desired_capabilities[:caps]
+          capabilities[:avd]                    = ENV['APP_DEVICE'] if ENV['APP_PLATFORM_NAME'].downcase.to_sym == :android
+          capabilities[:orientation]            = ENV['ORIENTATION'].upcase if ENV['ORIENTATION']
+          capabilities[:language]               = ENV['LANGUAGE'] if ENV['LANGUAGE']
+          capabilities[:locale]                 = ENV['LOCALE'].gsub('-', '_') if ENV['LOCALE']
+          capabilities[:newCommandTimeout]      = ENV['NEW_COMMAND_TIMEOUT'] if ENV['NEW_COMMAND_TIMEOUT']
+          capabilities[:noReset]                = ENV['APP_NO_RESET'] if ENV['APP_NO_RESET']
+          capabilities[:fullReset]              = ENV['APP_FULL_RESET'] if ENV['APP_FULL_RESET']
+          capabilities[:webkitDebugProxyPort]   = ENV['WEBKIT_DEBUG_PROXY_PORT'] if ENV['WEBKIT_DEBUG_PROXY_PORT']
+          capabilities[:webDriverAgentUrl]      = ENV['WEBDRIVER_AGENT_URL'] if ENV['WEBDRIVER_AGENT_URL']
+          capabilities[:wdaLocalPort]           = ENV['WDA_LOCAL_PORT'] if ENV['WDA_LOCAL_PORT']
+          capabilities[:usePrebuiltWDA]         = ENV['USE_PREBUILT_WDA'] if ENV['USE_PREBUILT_WDA']
+          capabilities[:useNewWDA]              = ENV['USE_NEW_WDA'] if ENV['USE_NEW_WDA']
+          capabilities[:startIWDP]              = ENV['START_IWDP'] if ENV['START_IWDP']
+          capabilities[:autoWebview]            = ENV['AUTO_WEBVIEW'] if ENV['AUTO_WEBVIEW']
+          capabilities[:chromedriverExecutable] = ENV['CHROMEDRIVER_EXECUTABLE'] if ENV['CHROMEDRIVER_EXECUTABLE']
+          capabilities[:autoWebviewTimeout]     = ENV['AUTO_WEBVIEW_TIMEOUT'] if ENV['AUTO_WEBVIEW_TIMEOUT']
+
+          if ENV['UDID']
+            capabilities[:udid]           = ENV['UDID']
+            capabilities[:bundleId]       = ENV['BUNDLE_ID'] if ENV['BUNDLE_ID']
+            capabilities[:xcodeOrgId]     = ENV['TEAM_ID'] if ENV['TEAM_ID']
+            capabilities[:xcodeSigningId] = ENV['TEAM_NAME'] if ENV['TEAM_NAME']
+            capabilities[:appActivity]    = ENV['APP_ACTIVITY'] if ENV['APP_ACTIVITY']
+            capabilities[:appPackage]     = ENV['APP_PACKAGE'] if ENV['APP_PACKAGE']
+          end
 
-        if ENV['APP']
-          capabilities[:app] = ENV['APP']
-        else
-          if Environ.is_android?
-            capabilities[:app] = Environ.current.android_apk_path
-          elsif Environ.is_ios?
-            Environ.is_device? ?
-                capabilities[:app] = Environ.current.ios_ipa_path :
-                capabilities[:app] = Environ.current.ios_app_path
+          if ENV['APP']
+            capabilities[:app] = ENV['APP']
+          else
+            if Environ.is_android?
+              capabilities[:app] = Environ.current.android_apk_path
+            elsif Environ.is_ios?
+              Environ.is_device? ?
+                  capabilities[:app] = Environ.current.ios_ipa_path :
+                  capabilities[:app] = Environ.current.ios_app_path
+            end
           end
+        when :browserstack
+          endpoint = "http://#{ENV['BS_USERNAME']}:#{ENV['BS_AUTHKEY']}@hub-cloud.browserstack.com/wd/hub"
+
+          capabilities = {}
+          capabilities['device']     = ENV['BS_DEVICE']
+          capabilities['os_version'] = ENV['BS_OS_VERSION']
+          capabilities['app']        = "bs://#{ENV['APP_ID']}"
+          capabilities['realMobile'] = true
+          capabilities['project']    = ENV['AUTOMATE_PROJECT'] if ENV['AUTOMATE_PROJECT']
+          capabilities['build']      = ENV['AUTOMATE_BUILD'] if ENV['AUTOMATE_BUILD']
+          capabilities['deviceOrientation']  = ENV['ORIENTATION'] if ENV['ORIENTATION']
+          capabilities['browserstack.debug'] = true
+          capabilities['browserstack.video'] = ENV['RECORD_VIDEO'] if ENV['RECORD_VIDEO']
+          capabilities['browserstack.debug'] = 'true'
+
+          appium_lib_options = { server_url: endpoint }
+          desired_capabilities = {
+              appium_lib:  appium_lib_options,
+              caps:        capabilities
+          }
         end
-
       else
         base_path = 'config'
         unless File.directory?(File.join(@config_file, base_path))
@@ -70,9 +110,13 @@ module TestCentricity
         appium_caps = File.join(@config_file, base_path, 'appium.txt')
         desired_capabilities = Appium.load_appium_txt file: appium_caps
       end
+
+      puts "Appium desired_capabilities = #{desired_capabilities}" if ENV['DEBUG']
+
       Appium::Driver.new(desired_capabilities).start_driver
       @running = true
       Appium.promote_appium_methods TestCentricity::ScreenObject
+      Appium.promote_appium_methods TestCentricity::ScreenSection
       Appium.promote_appium_methods TestCentricity::AppUIElement
 
       Environ.screen_size = $driver.window_size
@@ -152,6 +196,7 @@ module TestCentricity
 
     def self.default_context
       $driver.switch_to_default_context
+      puts "Current context = #{$driver.current_context}" if ENV['DEBUG']
     end
 
     def self.is_webview?
@@ -164,7 +209,9 @@ module TestCentricity
 
     def self.webview_context
       contexts = available_contexts
+      puts "Contexts = #{contexts}" if ENV['DEBUG']
       set_context(contexts.last)
+      puts "Current context = #{$driver.current_context}" if ENV['DEBUG']
     end
   end
 end

data/lib/testcentricity/app_core/screen_sections_helper.rb

@@ -361,7 +361,6 @@ module TestCentricity
     end
 
 
-
     def width
       section = find_section
       section_not_found_exception(section)
@@ -379,6 +378,7 @@ module TestCentricity
       section_not_found_exception(section)
       section.location.x
     end
+
     def y_loc
       section = find_section
       section_not_found_exception(section)
@@ -386,8 +386,6 @@ module TestCentricity
     end
 
 
-
-
     def verify_ui_states(ui_states)
       ui_states.each do |ui_object, object_states|
         object_states.each do |property, state|

data/lib/testcentricity/app_elements/app_element_helper.rb

@@ -35,19 +35,15 @@ module TestCentricity
     def tap
       obj = element
       object_not_found_exception(obj)
-      x = obj.location.x
-      y = obj.location.y
-      tap_action = Appium::TouchAction.new.tap(element: obj, x: x, y: y)
-      tap_action.perform
+      actions = Appium::TouchAction.new
+      actions.tap(element: obj).perform
     end
 
     def double_tap
       obj = element
       object_not_found_exception(obj)
-      x = obj.location.x
-      y = obj.location.y
-      tap_action = Appium::TouchAction.new.double_tap(element: obj, x: x, y: y)
-      tap_action.perform
+      actions = Appium::TouchAction.new
+      actions.double_tap(element: obj).perform
     end
 
     def set(value)
@@ -301,21 +297,44 @@ module TestCentricity
     def scroll(direction)
       obj = element
       object_not_found_exception(obj)
-      execute_script('mobile: scroll', direction: direction.to_s, element: obj)
+      if Environ.device_os == :ios
+        execute_script('mobile: scroll', direction: direction.to_s, element: obj)
+      else
+        case direction
+        when :down
+          x = obj.size.width.to_i / 2
+          bottom = obj.size.height
+          bottom = window_size[:height].to_i if bottom > window_size[:height]
+          start_pt = [x, bottom]
+          delta_pt = [0, 0 - (bottom - 20)]
+
+        when :up
+          x = obj.size.width.to_i / 2
+          top = obj.location.y - (obj.size.height / 2)
+          top = 0 if top < 0
+          start_pt = [x, top]
+          delta_pt = [0, obj.size.height / 2]
+        end
+        puts "Swipe start_pt = #{start_pt} / delta_pt = #{delta_pt}" if ENV['DEBUG']
+        Appium::TouchAction.new.swipe(start_x: start_pt[0], start_y: start_pt[1], delta_x: delta_pt[0], delta_y: delta_pt[1]).perform
+      end
     end
 
     def swipe(direction)
-      execute_script('mobile: swipe', direction: direction.to_s)
+      obj = element
+      object_not_found_exception(obj)
+      if Environ.device_os == :ios
+        execute_script('mobile: swipe', direction: direction.to_s, element: obj)
+      else
+        actions = Appium::TouchAction.new
+        actions.scroll(element: obj).perform
+      end
     end
 
-
     private
 
     def element
-      parent_section = @context == :section
-      parent_section ? tries ||= 2 : tries ||= 1
-
-      if parent_section && tries > 1
+      if @context == :section
         parent_obj = nil
         locators = @parent.get_locator
         locators.each do |parent_locator|
@@ -335,8 +354,7 @@ module TestCentricity
         obj
       end
     rescue
-      puts "Did not find parent object '#{@parent.get_name}' - #{@parent.get_locator}" if tries == 2 && ENV['DEBUG']
-      retry if (tries -= 1) > 0
+      puts "Did not find object '#{@name}' - #{@locator}" if ENV['DEBUG']
       nil
     end
 

data/lib/testcentricity/app_elements/list.rb

@@ -1,23 +1,51 @@
 module TestCentricity
   class AppList < AppUIElement
+    attr_accessor :list_item
+
     def initialize(name, parent, locator, context)
       super
-      @type = :list
+      @type      = :list
+      @list_item = nil
+    end
+
+    def define_list_elements(element_spec)
+      element_spec.each do |element, value|
+        case element
+        when :list_item
+          @list_item = value
+        else
+          raise "#{element} is not a recognized list element"
+        end
+      end
     end
 
     def get_item_count
       obj = element
       object_not_found_exception(obj)
-      if Environ.device_os == :ios
-        items = obj.find_elements(:class, 'XCUIElementTypeCell')
-      else
-        items = obj.find_elements(:class, 'android.widget.FrameLayout')
-      end
+      list_loc = get_list_item_locator
+      items = obj.find_elements(list_loc.keys[0], list_loc.values[0])
       items.size
     end
 
     def get_list_items
+      list_items = []
+      obj = element
+      object_not_found_exception(obj)
+      list_loc = get_list_item_locator
+      items = obj.find_elements(list_loc.keys[0], list_loc.values[0])
+      items.each do |item|
+        list_items.push(item.text)
+      end
+      list_items
+    end
 
+    def click_list_item(index)
+      obj = element
+      object_not_found_exception(obj)
+      list_loc = get_list_item_locator
+      items = obj.find_elements(list_loc.keys[0], list_loc.values[0])
+      list_item = items[index]
+      list_item.click
     end
 
     def get_list_item(index)
@@ -50,5 +78,18 @@ module TestCentricity
     rescue
       raise "Value of List #{object_ref_message} failed to change from '#{value}' after #{timeout} seconds" if get_item_count == value
     end
+
+    private
+
+    def get_list_item_locator
+      if @list_item.nil?
+        if Environ.device_os == :ios
+          define_list_elements({ :list_item => { class: 'XCUIElementTypeCell' } } )
+        else
+          define_list_elements({ :list_item => { class: 'android.widget.FrameLayout' } } )
+        end
+      end
+      @list_item
+    end
   end
 end

data/lib/testcentricity/version.rb

@@ -1,3 +1,3 @@
 module TestCentricity
-  VERSION = '2.3.19'
+  VERSION = '2.4.0'
 end

data/lib/testcentricity/web_core/webdriver_helper.rb

@@ -192,12 +192,21 @@ module TestCentricity
       else
         Environ.device = :simulator
       end
-      desired_capabilities[:safariInitialUrl] = ENV['APP_INITIAL_URL'] if ENV['APP_INITIAL_URL']
-      desired_capabilities[:safariAllowPopups] = ENV['APP_ALLOW_POPUPS'] if ENV['APP_ALLOW_POPUPS']
       desired_capabilities[:safariIgnoreFraudWarning] = ENV['APP_IGNORE_FRAUD_WARNING'] if ENV['APP_IGNORE_FRAUD_WARNING']
-      desired_capabilities[:noReset] = ENV['APP_NO_RESET'] if ENV['APP_NO_RESET']
+      desired_capabilities[:safariInitialUrl]       = ENV['APP_INITIAL_URL'] if ENV['APP_INITIAL_URL']
+      desired_capabilities[:safariAllowPopups]      = ENV['APP_ALLOW_POPUPS'] if ENV['APP_ALLOW_POPUPS']
+      desired_capabilities[:newCommandTimeout]      = ENV['NEW_COMMAND_TIMEOUT'] if ENV['NEW_COMMAND_TIMEOUT']
+      desired_capabilities[:noReset]                = ENV['APP_NO_RESET'] if ENV['APP_NO_RESET']
+      desired_capabilities[:fullReset]              = ENV['APP_FULL_RESET'] if ENV['APP_FULL_RESET']
+      desired_capabilities[:webkitDebugProxyPort]   = ENV['WEBKIT_DEBUG_PROXY_PORT'] if ENV['WEBKIT_DEBUG_PROXY_PORT']
+      desired_capabilities[:webDriverAgentUrl]      = ENV['WEBDRIVER_AGENT_URL'] if ENV['WEBDRIVER_AGENT_URL']
+      desired_capabilities[:wdaLocalPort]           = ENV['WDA_LOCAL_PORT'] if ENV['WDA_LOCAL_PORT']
+      desired_capabilities[:usePrebuiltWDA]         = ENV['USE_PREBUILT_WDA'] if ENV['USE_PREBUILT_WDA']
+      desired_capabilities[:useNewWDA]              = ENV['USE_NEW_WDA'] if ENV['USE_NEW_WDA']
+      desired_capabilities[:chromedriverExecutable] = ENV['CHROMEDRIVER_EXECUTABLE'] if ENV['CHROMEDRIVER_EXECUTABLE']
+
       desired_capabilities[:language] = ENV['LANGUAGE'] if ENV['LANGUAGE']
-      desired_capabilities[:locale] = ENV['LOCALE'].gsub('-', '_') if ENV['LOCALE']
+      desired_capabilities[:locale]   = ENV['LOCALE'].gsub('-', '_') if ENV['LOCALE']
 
       Capybara.register_driver :appium do |app|
         appium_lib_options = { server_url: endpoint }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testcentricity
 version: !ruby/object:Gem::Version
-  version: 2.3.19
+  version: 2.4.0
 platform: ruby
 authors:
 - A.J. Mrozinski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2018-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler