Fix UI tests in tvOS 15

Author: bcylin

.github/workflows/ci.yml

@@ -8,7 +8,6 @@ jobs:
     if: contains(github.event.head_commit.message, '[ci skip]') == false
     env:
       BUNDLE_PATH: vendor/bundle
-      DEVELOPER_DIR: /Applications/Xcode_11.7.app/Contents/Developer
     steps:
       - uses: actions/[email protected]
       - uses: actions/[email protected]

Example-tvOSUITests/ExampleUITests.swift

@@ -39,7 +39,7 @@ internal final class ExampleUITests: XCTestCase {
   func testInteractions() {
 
     let tables = XCUIApplication().tables
-    let existance = NSPredicate(format: "exists == true")
+    let existence = NSPredicate(format: "exists == true")
     let hasFocus = NSPredicate(format: "hasFocus == true")
 
     expectation(for: hasFocus, evaluatedWith: tables.cells.containing(.staticText, identifier: "Setting 1").element, handler: nil)
@@ -56,7 +56,7 @@ internal final class ExampleUITests: XCTestCase {
     waitForExpectations(timeout: 5, handler: nil)
     XCUIRemote.shared.press(.select)
 
-    expectation(for: hasFocus, evaluatedWith: app.alerts["Tap action"].otherElements["OK"], handler: nil)
+    expectation(for: existence, evaluatedWith: app.alerts["Tap action"].buttons["OK"], handler: nil)
     waitForExpectations(timeout: 5, handler: nil)
     XCUIRemote.shared.press(.select)
 
@@ -68,7 +68,7 @@ internal final class ExampleUITests: XCTestCase {
     waitForExpectations(timeout: 5, handler: nil)
     XCUIRemote.shared.press(.select)
 
-    expectation(for: existance, evaluatedWith: app.otherElements.containing(.staticText, identifier: "CellStyle.default").element, handler: nil)
+    expectation(for: existence, evaluatedWith: app.otherElements.containing(.staticText, identifier: "CellStyle.default").element, handler: nil)
     waitForExpectations(timeout: 5, handler: nil)
     XCUIRemote.shared.press(.menu)
 
@@ -80,7 +80,7 @@ internal final class ExampleUITests: XCTestCase {
     waitForExpectations(timeout: 5, handler: nil)
     XCUIRemote.shared.press(.select)
 
-    expectation(for: existance, evaluatedWith: app.otherElements.containing(.staticText, identifier: "CellStyle.subtitle").element, handler: nil)
+    expectation(for: existence, evaluatedWith: app.otherElements.containing(.staticText, identifier: "CellStyle.subtitle").element, handler: nil)
     waitForExpectations(timeout: 5, handler: nil)
     XCUIRemote.shared.press(.menu)
 

QuickTableViewController.xcodeproj/project.pbxproj

@@ -691,9 +691,9 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = B54A243B2088816E00EEBA26 /* Build configuration list for PBXNativeTarget "QuickTableViewController-tvOS" */;
 			buildPhases = (
+				B54A24232088816D00EEBA26 /* Headers */,
 				B54A24212088816D00EEBA26 /* Sources */,
 				B54A24222088816D00EEBA26 /* Frameworks */,
-				B54A24232088816D00EEBA26 /* Headers */,
 				B54A24242088816D00EEBA26 /* Resources */,
 			);
 			buildRules = (

Source/QuickTableViewController.swift

@@ -84,6 +84,9 @@ open class QuickTableViewController: UIViewController, UITableViewDataSource, UI
     tableView.estimatedRowHeight = 44
     tableView.dataSource = self
     tableView.delegate = self
+    #if os(tvOS)
+    tableView.remembersLastFocusedIndexPath = true
+    #endif
   }
 
   open override func viewWillAppear(_ animated: Bool) {
@@ -190,6 +193,18 @@ open class QuickTableViewController: UIViewController, UITableViewDataSource, UI
   }
   #endif
 
+  #if os(tvOS)
+  private var currentFocusedIndexPath: IndexPath?
+
+  open override func didUpdateFocus(in context: UIFocusUpdateContext, with coordinator: UIFocusAnimationCoordinator) {
+    currentFocusedIndexPath = (context.nextFocusedView as? UITableViewCell).flatMap(tableView.indexPath(for:))
+  }
+
+  public func indexPathForPreferredFocusedView(in tableView: UITableView) -> IndexPath? {
+    return currentFocusedIndexPath
+  }
+  #endif
+
 }
 
 // MARK: - SwitchCellDelegate