Skip to content

Refactor FXIOS-12796 [Swift 6 Migration] Fix main actor isolation warnings that are Swift 6 errors in the XCUITests suite - Batch 2 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tomerqodo wants to merge 6 commits into
base: codex_full_base__refactor_fxios-12796_swift_6_migration_fix_main_actor_isolation_warnings_that_are_swift_6_errors_in_the_xcuitests_suite_-_batch_2_pr2
Choose a base branch
from
Open

Refactor FXIOS-12796 [Swift 6 Migration] Fix main actor isolation warnings that are Swift 6 errors in the XCUITests suite - Batch 2 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
479bf8f
Fix main actor isolation warnings that are Swift 6 errors in the XCUI…
ih-codes Dec 1, 2025
a036560
no message
ih-codes Dec 1, 2025
a7d891e
Fix setup/teardown warnings in the XCUITests suite.
ih-codes Dec 1, 2025
b5b21d0
Add main actor isolation to register* UI helper methods.
ih-codes Dec 1, 2025
ed8f2a5
Fix a few more warnings.
ih-codes Dec 1, 2025
81d28b8
update pr
tomerqodo Jan 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/A11yOnboardingTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ class A11yOnboardingTests: BaseTestCase {
return "\(AccessibilityIdentifiers.Onboarding.onboarding)\(currentScreen)"
}

override func setUp() {
override func setUp() async throws {
launchArguments = [LaunchArguments.ClearProfile,
LaunchArguments.DisableAnimations,
LaunchArguments.SkipSplashScreenExperiment]
currentScreen = 0
super.setUp()
try await super.setUp()
}

override func tearDown() {
override func tearDown() async throws {
app.terminate()
super.tearDown()
try await super.tearDown()
}

func testA11yFirstRunTour() throws {
Expand Down
5 changes: 1 addition & 4 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/A11yUtils.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/

import XCTest

@MainActor
Comment on lines 1 to +3
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot Jan 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Restore required MPL header in this Swift file

Root AGENTS.md rule 1 requires every .swift file to begin with the exact Mozilla Public License v2.0 header. A11yUtils.swift now starts with import XCTest and no header, which violates that compliance rule and can break licensing checks or CI gates that enforce it. Please restore the exact MPL header at the top of this file.

Useful? React with 👍 / 👎.

class A11yUtils: XCTestCase {
public struct MissingAccessibilityElement {
public let elementType: String
Expand Down
10 changes: 6 additions & 4 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/ActivityStreamTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ class ActivityStreamTest: FeatureFlaggedTestBase {
let testWithDB = ["testTopSites2Add", "testTopSitesRemoveAllExceptDefaultClearPrivateData"]
// Using the DDDBBs created for these tests containing enough entries for the tests that used them listed above
let pagesVisited = "browserActivityStreamPages-places.db"
override func setUp() {

override func setUp() async throws {
// Test name looks like: "[Class testFunc]", parse out the function name
let parts = name.replacingOccurrences(of: "]", with: "").split(separator: " ")
let key = String(parts[1])
Expand All @@ -41,16 +42,17 @@ class ActivityStreamTest: FeatureFlaggedTestBase {
}
launchArguments.append(LaunchArguments.SkipAddingGoogleTopSite)
launchArguments.append(LaunchArguments.SkipSponsoredShortcuts)
super.setUp()
try await super.setUp()
topSites = TopSitesScreen(app: app)
contextMenu = ContextMenuScreen(app: app)
tabTray = TabTrayScreen(app: app)
browser = BrowserScreen(app: app)
toolbar = ToolbarScreen(app: app)
}
override func tearDown() {

override func tearDown() async throws {
XCUIDevice.shared.orientation = .portrait
super.tearDown()
try await super.tearDown()
}

// https://mozilla.testrail.io/index.php?/cases/view/2273342
Expand Down
18 changes: 10 additions & 8 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/BaseTestCase.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ import Shared
let page1 = "http://localhost:\(serverPort)/test-fixture/find-in-page-test.html"
let page2 = "http://localhost:\(serverPort)/test-fixture/test-example.html"
let serverPort = ProcessInfo.processInfo.environment["WEBSERVER_PORT"] ?? "\(Int.random(in: 1025..<65000))"
@MainActor
let urlBarAddress = XCUIApplication().textFields[AccessibilityIdentifiers.Browser.AddressToolbar.searchTextField]
@MainActor
let homepageSearchBar = XCUIApplication().cells[AccessibilityIdentifiers.FirefoxHomepage.SearchBar.itemCell]

func path(forTestPage page: String) -> String {
Expand Down Expand Up @@ -107,16 +109,16 @@ class BaseTestCase: XCTestCase {
}
}

override func setUp() {
super.setUp()
override func setUp() async throws {
try await super.setUp()
continueAfterFailure = false
setUpApp()
setUpScreenGraph()
}

override func tearDown() {
override func tearDown() async throws {
app.terminate()
super.tearDown()
try await super.tearDown()
}

var skipPlatform: Bool {
Expand Down Expand Up @@ -503,19 +505,19 @@ class BaseTestCase: XCTestCase {
}

class IpadOnlyTestCase: BaseTestCase {
override func setUp() {
override func setUp() async throws {
specificForPlatform = .pad
if iPad() {
super.setUp()
await super.setUp()
}
}
}

class IphoneOnlyTestCase: BaseTestCase {
override func setUp() {
override func setUp() async throws {
specificForPlatform = .phone
if !iPad() {
super.setUp()
try await super.setUp()
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/BookmarksTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ class BookmarksTests: FeatureFlaggedTestBase {
private var homepageSettingsScreen: HomepageSettingsScreen!
private var firefoxHomeScreen: FirefoxHomePageScreen!

override func setUp() {
super.setUp()
override func setUp() async throws {
try await super.setUp()
topSitesScreen = TopSitesScreen(app: app)
browserScreen = BrowserScreen(app: app)
toolbarScreen = ToolbarScreen(app: app)
Expand All @@ -28,9 +28,9 @@ class BookmarksTests: FeatureFlaggedTestBase {
firefoxHomeScreen = FirefoxHomePageScreen(app: app)
}

override func tearDown() {
override func tearDown() async throws {
XCUIDevice.shared.orientation = .portrait
super.tearDown()
try await super.tearDown()
}

private func checkBookmarked() {
Expand Down
4 changes: 2 additions & 2 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/BrowsingPDFTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ class BrowsingPDFTests: BaseTestCase {
private var contextMenu: ContextMenuScreen!
private var library: LibraryScreen!

override func setUp() {
override func setUp() async throws {
// Test name looks like: "[Class testFunc]", parse out the function name
super.setUp()
try await super.setUp()
topSites = TopSitesScreen(app: app)
contextMenu = ContextMenuScreen(app: app)
pdf = PDFScreen(app: app)
Expand Down
9 changes: 5 additions & 4 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/C_AddressesTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ class O_AddressesTests: BaseTestCase {
private var settingsScreen: SettingScreen!
private var browserScreen: BrowserScreen!

override func setUp() {
super.setUp()
override func setUp() async throws {
try await super.setUp()

if #available(iOS 16, *) {
if !name.contains("testAddressOptionIsAvailableInSettingsMenu") {
navigator.nowAt(NewTabScreen)
Expand All @@ -34,13 +35,13 @@ class O_AddressesTests: BaseTestCase {
browserScreen = BrowserScreen(app: app)
}

override func tearDown() {
override func tearDown() async throws {
if name.contains("testAddressOptionIsAvailableInSettingsMenu") {
switchThemeToDarkOrLight(theme: "Light")
XCUIDevice.shared.orientation = .portrait
}
app.terminate()
super.tearDown()
try await super.tearDown()
}

// https://mozilla.testrail.io/index.php?/cases/view/2618637
Expand Down
4 changes: 2 additions & 2 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/CookiePersistenceTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ final class CookiePersistenceTests: BaseTestCase {
let cookieSiteURL = "http://localhost:\(serverPort)/test-fixture/test-cookie-store.html"
let topSitesTitle = ["Facebook", "YouTube", "Wikipedia"]

override func setUp() {
override func setUp() async throws {
// Fresh install the app
// removeApp() does not work on iOS 15 and 16 intermittently
if #available(iOS 17, *) {
removeApp()
}

// The app is correctly installed
super.setUp()
try await super.setUp()
}

func testCookiePersistenceBasic() {
Expand Down
4 changes: 2 additions & 2 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/DatabaseFixtureTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class DatabaseFixtureTest: BaseTestCase {
"testHistoryDatabaseFixture": "testHistoryDatabase100-places.db"
]

override func setUp() {
override func setUp() async throws {
// Test name looks like: "[Class testFunc]", parse out the function name
let parts = name.replacingOccurrences(of: "]", with: "").split(separator: " ")
let key = String(parts[1])
Expand All @@ -21,7 +21,7 @@ class DatabaseFixtureTest: BaseTestCase {
LaunchArguments.LoadDatabasePrefix + fixtures[key]!,
LaunchArguments.SkipContextualHints,
LaunchArguments.DisableAnimations]
super.setUp()
try await super.setUp()
}

// https://mozilla.testrail.io/index.php?/cases/view/2458579
Expand Down
4 changes: 2 additions & 2 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/DesktopModeTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@ class DesktopModeTestsIphone: BaseTestCase {
var toolbarScreen: ToolbarScreen!
var mainMenuScreen: MainMenuScreen!

override func setUp() {
override func setUp() async throws {
specificForPlatform = .phone
if !iPad() {
super.setUp()
try await super.setUp()
}
browserScreen = BrowserScreen(app: app)
toolbarScreen = ToolbarScreen(app: app)
Expand Down
4 changes: 2 additions & 2 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/DisplaySettingsTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import XCTest

class DisplaySettingTests: BaseTestCase {
override func setUp() {
override func setUp() async throws {
// Fresh install the app
// removeApp() does not work on iOS 15 and 16 intermittently
if name.contains("testCheckDisplaySettingsDefault") {
Expand All @@ -14,7 +14,7 @@ class DisplaySettingTests: BaseTestCase {
}
}
// The app is correctly installed
super.setUp()
try await super.setUp()
}

// https://mozilla.testrail.io/index.php?/cases/view/2337485
Expand Down
4 changes: 2 additions & 2 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/DomainAutocompleteTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class DomainAutocompleteTests: BaseTestCase {
// This DB contains 3 entries mozilla.com/github.com/git.es
let historyDB = "browserAutocomplete-places.db"

override func setUp() {
override func setUp() async throws {
// Test name looks like: "[Class testFunc]", parse out the function name
let parts = name.replacingOccurrences(of: "]", with: "").split(separator: " ")
let key = String(parts[1])
Expand All @@ -41,7 +41,7 @@ class DomainAutocompleteTests: BaseTestCase {
LaunchArguments.SkipContextualHints,
LaunchArguments.DisableAnimations]
}
super.setUp()
try await super.setUp()
}

// https://mozilla.testrail.io/index.php?/cases/view/2334558
Expand Down
8 changes: 4 additions & 4 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/DragAndDropTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ class DragAndDropTestIpad: IpadOnlyTestCase {
// This DDBB contains those 4 websites listed in the name
let historyAndBookmarksDB = "browserYoutubeTwitterMozillaExample-places.db"

override func setUp() {
override func setUp() async throws {
// Test name looks like: "[Class testFunc]", parse out the function name
let parts = name.replacingOccurrences(of: "]", with: "").split(separator: " ")
let key = String(parts[1])
Expand All @@ -304,12 +304,12 @@ class DragAndDropTestIpad: IpadOnlyTestCase {
LaunchArguments.SkipContextualHints,
LaunchArguments.DisableAnimations]
}
super.setUp()
try await super.setUp()
}

override func tearDown() {
override func tearDown() async throws {
XCUIDevice.shared.orientation = UIDeviceOrientation.portrait
super.tearDown()
try await super.tearDown()
}

// https://mozilla.testrail.io/index.php?/cases/view/2307024
Expand Down
4 changes: 2 additions & 2 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/EngagementNotificationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
import XCTest

class EngagementNotificationTests: BaseTestCase {
override func setUp() {
override func setUp() async throws {
// Fresh install the app
// removeApp() does not work on iOS 15 and 16 intermittently
if #available(iOS 17, *) {
removeApp()
}
// The app is correctly installed
super.setUp()
try await super.setUp()
}

// https://mozilla.testrail.io/index.php?/cases/view/2307101
Expand Down
4 changes: 2 additions & 2 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/FeatureFlaggedTestBase.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ class FeatureFlaggedTestSuite: FeatureFlaggedTestBase {
addLaunchArgument(jsonFileName: jsonFileName, featureName: featureName)
}

override func setUp() {
override func setUp() async throws {
continueAfterFailure = false
setUpExperimentVariables()
setUpApp()
setUpExperimentVariables()
setUpLaunchArguments()
Comment on lines +46 to 50
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot Jan 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Set experiment variables before using them in setUp

FeatureFlaggedTestSuite.setUp() now calls setUpApp() before setUpExperimentVariables(), but setUpApp() immediately reads jsonFileName/featureName (IUO properties) to build launch arguments. In subclasses that set those values inside setUpExperimentVariables(), this reordering means the IUOs are still nil and will trap at runtime or cause missing experiment/feature arguments. The previous order ensured the variables were set before use.

Useful? React with 👍 / 👎.

setUpScreenGraph()
}
Expand Down
8 changes: 8 additions & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/FxScreenGraph.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import Foundation
import MappaMundi
import XCTest

@MainActor
func createScreenGraph(for test: XCTestCase, with app: XCUIApplication) -> MMScreenGraph<FxUserState> {
let map = MMScreenGraph(for: test, with: FxUserState.self)

Expand Down Expand Up @@ -123,31 +124,38 @@ let allHomePanels = [
LibraryPanel_Downloads
]

@MainActor
let iOS_Settings = XCUIApplication(bundleIdentifier: "com.apple.Preferences")
@MainActor
let springboard = XCUIApplication(bundleIdentifier: "com.apple.springboard")

@MainActor
func navigationControllerBackAction(for app: XCUIApplication) -> () -> Void {
return {
app.navigationBars.element(boundBy: 0).buttons.element(boundBy: 0).waitAndTap()
}
}

@MainActor
func cancelBackAction(for app: XCUIApplication) -> () -> Void {
return {
app.otherElements["PopoverDismissRegion"].waitAndTap()
}
}

@MainActor
func dismissContextMenuAction(app: XCUIApplication) -> () -> Void {
return {
app.coordinate(withNormalizedOffset: CGVector(dx: 0.5, dy: 0.25)).tap()
}
}

@MainActor
func select(rows: Int, in app: XCUIApplication) {
app.staticTexts[String(rows)].firstMatch.waitAndTap()
}

@MainActor
func type(text: String, in app: XCUIApplication) {
text.forEach { char in
app.keys[String(char)].waitAndTap()
Expand Down
4 changes: 2 additions & 2 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/HistoryTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class HistoryTests: BaseTestCase {
var browserScreen: BrowserScreen!
var historyScreen: HistoryScreen!

override func setUp() {
override func setUp() async throws {
// Test name looks like: "[Class testFunc]", parse out the function name
let parts = name.replacingOccurrences(of: "]", with: "").split(separator: " ")
let key = String(parts[1])
Expand All @@ -57,7 +57,7 @@ class HistoryTests: BaseTestCase {
LaunchArguments.SkipContextualHints,
LaunchArguments.DisableAnimations]
}
super.setUp()
try await super.setUp()
toolbarScreen = ToolbarScreen(app: app)
settingScreen = SettingScreen(app: app)
browserScreen = BrowserScreen(app: app)
Expand Down
Loading