ci: run iOS 13 and Android 10 as CI (#238)

* try to run with the latest set

* use iPhone 11

* rename ios 13 check method

Author: KazuCocoa

ci-jobs/functional_test.yml

@@ -2,9 +2,9 @@
 parameters:
   vmImage: 'macOS-10.14'
   vmImageForIOS: 'macOS-10.14' # Not sure the reason, but macOS 10.14 instance raises no info.plist error
-  xcodeForIOS: 10.3
-  xcodeForTVOS: 10.2
-  androidSDK: 28
+  xcodeForIOS: 11
+  xcodeForTVOS: 11
+  androidSDK: 29
   appiumVersion: 'beta'
   ignoreVersionSkip: true
   CI: true

test/functional/ios/driver_test.rb

@@ -21,7 +21,11 @@ class DriverTest < AppiumLibCoreTest::Function::TestCase
     private
 
     def alert_view_cell
-      ios_platform_version_over13(@@driver) ? 'Alert Controller' : 'Alert Views'
+      over_ios13?(@@driver) ? 'Alert Controller' : 'Alert Views'
+    end
+
+    def uicatalog
+      over_ios13?(@@driver) ? 'UIKitCatalog' : 'UICatalog'
     end
 
     public
@@ -56,13 +60,13 @@ def test_screenshot
     end
 
     def test_wait_true
-      e = @@core.wait_true { @@driver.find_element :accessibility_id, 'UICatalog' }
+      e = @@core.wait_true { @@driver.find_element :accessibility_id, uicatalog }
       assert e.name
     end
 
     def test_wait
-      e = @@core.wait { @@driver.find_element :accessibility_id, 'UICatalog' }
-      assert_equal 'UICatalog', e.name
+      e = @@core.wait { @@driver.find_element :accessibility_id, uicatalog }
+      assert_equal uicatalog, e.name
     end
 
     def test_click_back
@@ -71,13 +75,17 @@ def test_click_back
       e = @@driver.find_element :accessibility_id, alert_view_cell
       e.click
       sleep 1 # wait for animation
-      error = assert_raises do
-        e.click
+      if over_ios13?(@@driver)
+        e.click # nothing happens
+      else
+        error = assert_raises do
+          e.click
+        end
+        assert [::Selenium::WebDriver::Error::UnknownError,
+                ::Selenium::WebDriver::Error::ElementNotVisibleError,
+                ::Selenium::WebDriver::Error::InvalidSelectorError].include? error.class
+        assert error.message.include? ' is not visible on the screen and thus is not interactable'
       end
-      assert [::Selenium::WebDriver::Error::UnknownError,
-              ::Selenium::WebDriver::Error::ElementNotVisibleError,
-              ::Selenium::WebDriver::Error::InvalidSelectorError].include? error.class
-      assert error.message.include? ' is not visible on the screen and thus is not interactable'
       @@driver.back
     end
 
@@ -87,6 +95,7 @@ def test_default_keyboard_pref
 
       bundle_id = @@driver.session_capabilities['CFBundleIdentifier']
       begin
+        @@driver.terminate_app('com.apple.Preferences') # To ensure the app shows the top view
         @@driver.activate_app('com.apple.Preferences')
         @@driver.find_element(:accessibility_id, 'General').click
         @@driver.find_element(:accessibility_id, 'Keyboard').click

test/functional/ios/ios/device_test.rb

@@ -28,7 +28,7 @@ class DeviceTest < AppiumLibCoreTest::Function::TestCase
       private
 
       def alert_view_cell
-        ios_platform_version_over13(@@driver) ? 'Alert Controller' : 'Alert Views'
+        over_ios13?(@@driver) ? 'Alert Controller' : 'Alert Views'
       end
 
       public
@@ -123,7 +123,7 @@ def test_context_related
       end
 
       def test_app_string
-        default_lang = ios_platform_version_over13(@@driver) ? 'Base' : 'en'
+        default_lang = over_ios13?(@@driver) ? 'Base' : 'en'
         assert_equal 'A Short Title Is Best', @@driver.app_strings(default_lang)['A Short Title Is Best']
       end
 

test/functional/ios/ios/mobile_commands_test.rb

@@ -18,6 +18,14 @@
 class AppiumLibCoreTest
   module Ios
     class MobileCommandsTest < AppiumLibCoreTest::Function::TestCase
+      private
+
+      def uicatalog
+        over_ios13?(@driver) ? 'UIKitCatalog' : 'UICatalog'
+      end
+
+      public
+
       def setup
         @core = ::Appium::Core.for(Caps.ios)
       end
@@ -80,11 +88,12 @@ def test_permission
         assert @driver.execute_script('mobile: getPermission',
                                       { service: 'photos', bundleId: 'com.example.apple-samplecode.UICatalog' }) == 'no'
 
+        @driver.terminate_app('com.apple.Preferences') # To ensure the app shows the top view
         @driver.activate_app('com.apple.Preferences')
         @driver.find_element(:accessibility_id, 'Privacy').click
 
         @driver.find_element(:accessibility_id, 'Calendars').click
-        el = @driver.find_element(:accessibility_id, 'UICatalog')
+        el = @driver.find_element(:accessibility_id, uicatalog)
         assert_equal '1', el.value
 
         @driver.back

test/functional/ios/patch_test.rb

@@ -19,6 +19,15 @@
 # rubocop:disable Style/ClassVars
 class AppiumLibCoreTest
   class PathTest < AppiumLibCoreTest::Function::TestCase
+    private
+
+    # Should click before typing text for iOS 13 simulator case since the simulator looks unstable
+    def ensure_type(element)
+      element.click if over_ios13?(@@driver)
+    end
+
+    public
+
     def setup
       @@core = ::Appium::Core.for(Caps.ios)
       @@driver = @@core.start_driver
@@ -41,7 +50,8 @@ def test_type
 
       @@core.wait { @@driver.find_element :accessibility_id, 'Text Fields' }.click
 
-      text = @@core.wait { @@driver.find_element :name, 'Placeholder text' }
+      text = @@core.wait { @@driver.find_element :class, 'XCUIElementTypeTextField' }
+      ensure_type text
       text.type 'hello'
 
       e = @@core.wait { @@driver.find_element :name, 'hello' }
@@ -54,7 +64,7 @@ def test_location_rel
       e = @@core.wait { @@driver.find_element :accessibility_id, 'Date Picker' }
       location = e.location_rel @@driver
 
-      if ios_platform_version_over13(@@driver)
+      if over_ios13?(@@driver)
         assert_equal '64.0 / 414.0', location.x
         assert_equal '235.5 / 896.0', location.y
       else
@@ -68,8 +78,9 @@ def test_immediate_value
 
       @@core.wait { @@driver.find_element :accessibility_id, 'Text Fields' }.click
 
-      text = @@core.wait { @@driver.find_element :name, 'Placeholder text' }
-      text.immediate_value('hello')
+      text = @@core.wait { @@driver.find_element :class, 'XCUIElementTypeTextField' }
+      ensure_type text
+      text.immediate_value 'hello'
 
       text = @@core.wait { @@driver.find_element :name, 'hello' }
       assert_equal 'hello', text.value

test/functional/ios/webdriver/device_test.rb

@@ -23,11 +23,11 @@ class DeviceTest < AppiumLibCoreTest::Function::TestCase
       private
 
       def alert_view_cell
-        ios_platform_version_over13(@@driver) ? 'Alert Controller' : 'Alert Views'
+        over_ios13?(@@driver) ? 'Alert Controller' : 'Alert Views'
       end
 
       def okay_cancel_cell
-        ios_platform_version_over13(@@driver) ? 'OK / Cancel' : 'Okay / Cancel'
+        over_ios13?(@@driver) ? 'OK / Cancel' : 'Okay / Cancel'
       end
 
       public

test/functional/ios/webdriver/w3c_actions_test.rb

@@ -36,7 +36,7 @@ def test_tap
         el = @@core.wait { @@driver.find_element(:accessibility_id, 'Buttons') }
         @@driver.action.click(el).perform
 
-        el = @@core.wait { @@driver.find_element(:name, ios_platform_version_over13(@@driver) ? 'X' : 'X Button') }
+        el = @@core.wait { @@driver.find_element(:name, over_ios13?(@@driver) ? 'X' : 'X Button') }
         rect = el.rect
         @@driver.action.click_and_hold(el).move_to_location(rect.x, rect.y + 500).release.perform
       end

test/test_helper.rb

@@ -58,7 +58,7 @@ def skip_as_appium_version(required_version)
         # rubocop:enable Style/GuardClause
       end
 
-      def ios_platform_version_over13(driver)
+      def over_ios13?(driver)
         Gem::Version.create(driver.capabilities['platformVersion']) >= Gem::Version.create('13.0')
       end
 
@@ -99,7 +99,7 @@ def self.android_web
 
     # Require a simulator which OS version is 11.4, for example.
     def ios(platform_name = :ios)
-      platform_version = platform_name == :tvos ? '12.2' : '12.4'
+      platform_version = '13.0'
       wda_port = wda_local_port
 
       real_device = ENV['REAL'] ? true : false
@@ -108,9 +108,9 @@ def ios(platform_name = :ios)
         caps: { # :desiredCapabilities is also available
           platformName: platform_name,
           automationName: ENV['AUTOMATION_NAME_IOS'] || 'XCUITest',
-          udid: 'auto',
+          # udid: 'auto',
           platformVersion: platform_version,
-          deviceName: device_name(platform_name, wda_port),
+          deviceName: device_name(platform_version, platform_name, wda_port),
           useNewWDA: false,
           eventTimings: true,
           useJSONSource: true,
@@ -154,20 +154,25 @@ def ios(platform_name = :ios)
 
     private
 
+    def over_ios13?(os_version)
+      Gem::Version.create(os_version) >= Gem::Version.create('13.0')
+    end
+
     def test_app(os_version)
-      if Gem::Version.create(os_version) >= Gem::Version.create('13.0')
+      if over_ios13?(os_version)
         # https://github.com/appium/ios-uicatalog/pull/15
         "#{Dir.pwd}/test/functional/app/iOS13__UICatalog.app.zip"
       else
         "#{Dir.pwd}/test/functional/app/UICatalog.app.zip"
       end
     end
 
-    def device_name(platform_name, wda_local_port)
+    def device_name(os_version, platform_name, wda_local_port)
       if platform_name.downcase == :tvos
         'Apple TV'
       else
-        parallel? ? "iPhone Xs Max - #{wda_local_port}" : 'iPhone Xs Max'
+        name = over_ios13?(os_version) ? 'iPhone 11' : 'iPhone Xs Max'
+        parallel? ? "#{name} - #{wda_local_port}" : name
       end
     end