tweak more

Author: KazuCocoa

test/functional/ios/driver_test.rb

@@ -118,7 +118,7 @@ def test_default_keyboard_pref
         @@driver.find_element(:accessibility_id, 'Keyboard').click
 
         # to wait the animation
-        auto_correction_name = over_ios26?(@@driver) ? 'KeyboardAutocorrection' : 'Auto-Correction'
+        auto_correction_name = over_ios26? @@driver ? 'KeyboardAutocorrection' : 'Auto-Correction'
         @@driver.wait { |d| d.find_element :accessibility_id, auto_correction_name }
 
         auto_correction = @@driver.wait do |d|
@@ -127,9 +127,9 @@ def test_default_keyboard_pref
 
         # need to bding the element into the screen
         w3c_scroll @@driver, duration: 1.0
-        search_word = if over_ios26?(@@driver)
+        search_word = if over_ios26? @@driver
                         'KeyboardPrediction'
-                      elsif over_ios17?(@@driver)
+                      elsif over_ios17? @@driver
                         'Predictive Text'
                       else
                         'Predictive'

test/functional/ios/ios/mobile_commands_test.rb

@@ -84,6 +84,7 @@ def test_permission
         core = ::Appium::Core.for(caps)
         @driver = core.start_driver
 
+        skip 'Not stable on CI' if ci?
         # skip 'Permissions does not work well on iOS 14 yet' if over_ios14?(@driver)
         assert @driver.execute_script('mobile: getPermission',
                                       { service: 'calendar', bundleId: 'com.example.apple-samplecode.UICatalog' }) == 'yes'
@@ -94,12 +95,14 @@ def test_permission
         @driver.activate_app('com.apple.Preferences')
         @driver.settings.update({ defaultActiveApplication: 'com.apple.Preferences' })
         w3c_scroll @driver, duration: 1.0
-        @driver.find_element(:accessibility_id, 'com.apple.settings.privacyAndSecurity').click
+
+        privacy_name = over_ios26? @driver ? 'com.apple.settings.privacyAndSecurity' : 'Privacy'
+        @driver.find_element(:accessibility_id, privacy_name).click
 
         @driver.find_element(:accessibility_id, 'Calendars').click
         if over_ios26? @driver
           # without exceptions
-          d.find_element :predicate, "label == 'UIKitCatalog, Full Access'"
+          @driver.find_element :predicate, "label == 'UIKitCatalog, Full Access'"
         else
           el = @driver.find_element(:accessibility_id, uicatalog)
           assert_equal '1', el.value