Skip to content

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

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

Merged
ih-codes merged 2 commits into from
Dec 1, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42eb1a6
Fix main actor isolation warnings that are Swift 6 errors in the XCUI…
ih-codes Dec 1, 2025
be17b0c
no message
ih-codes Dec 1, 2025
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
1 change: 1 addition & 0 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 @@ -22,6 +22,7 @@ let TIMEOUT: TimeInterval = 20
let TIMEOUT_LONG: TimeInterval = 45
let MAX_SWIPE = 5

@MainActor
class BaseTestCase: XCTestCase {
var navigator: MMNavigator<FxUserState>!
let app = XCUIApplication()
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/AddCreditCardScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// 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/

@MainActor
final class AddCreditCardScreen {
private let app: XCUIApplication
private let sel: AddCreditCardSelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/AddressScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class AddressScreen {
private let app: XCUIApplication
private let sel: AddressSelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/AutofillFormScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class AutofillFormScreen {
private let app: XCUIApplication
private let sel: AutofillSelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/BrowserScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class BrowserScreen {
private let app: XCUIApplication
private let sel: BrowserSelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/ContextMenuScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import XCTest
import Common

@MainActor
final class ContextMenuScreen {
private let app: XCUIApplication
private let sel: ContextMenuSelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/CreditCardsScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class CreditCardsScreen {
private let app: XCUIApplication
private let sel: CreditCardsSelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/DownloadScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class DownloadsScreen {
private let app: XCUIApplication
private let sel: DownloadsSelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/EditCreditCardScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// 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/

@MainActor
final class EditCreditCardScreen {
private let app: XCUIApplication
private let sel: EditCreditCardSelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/FindInPageScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class FindInPageScreen {
private let app: XCUIApplication
private let sel: FindInPageSelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/FirefoxHomePageScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class FirefoxHomePageScreen {
private let app: XCUIApplication
private let sel: FirefoxHomePageSelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/HistoryScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// 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/

@MainActor
final class HistoryScreen {
private let app: XCUIApplication
private let sel: HistorySelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/HomaPageScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// 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/

@MainActor
final class HomePageScreen {
private let app: XCUIApplication
private let sel: HomePageSelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/HomepageSettingsScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class HomepageSettingsScreen {
private let app: XCUIApplication
private let sel: HomepageSettingsSelectorSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/LibraryScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class LibraryScreen {
private let app: XCUIApplication
private let sel: LibrarySelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/LoginSettingsScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class LoginSettingsScreen {
private let app: XCUIApplication
private let sel: LoginSettingsSelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/MainMenuScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class MainMenuScreen {
private let app: XCUIApplication
private let sel: MainMenuSelectorSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/NewTabSettingsScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class NewTabSettingsScreen {
private let app: XCUIApplication
private let sel: NewTabSettingsSelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/NewTabsScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class NewTabsScreen {
private let app: XCUIApplication
private let sel: NewTabSelectorSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/OnboardingScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class OnboardingScreen {
private let app: XCUIApplication
private let sel: OnboardingSelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/PDFScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class PDFScreen {
private let app: XCUIApplication
private let sel: PDFSelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/PhotonActionSheetScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class PhotonActionSheetScreen {
private let app: XCUIApplication
private let sel: PhotonActionSheetSelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/ReadingListScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class ReadingListScreen {
private let app: XCUIApplication
private let sel: ReadingListSelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/SSLWarningScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class SSLWarningScreen {
private let app: XCUIApplication
private let sel: SSLWarningSelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/SaveLoginAlertScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// 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/

@MainActor
final class SaveLoginAlertScreen {
private let app: XCUIApplication
private let sel: SaveLoginAlertSelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/SettingScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class SettingScreen {
private let app: XCUIApplication
private let sel: SettingsSelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/SettingsHomepageScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class SettingsHomepageScreen {
private let app: XCUIApplication
private let sel: SettingsHomepageSelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/TabTrayScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class TabTrayScreen {
private let app: XCUIApplication
private let sel: TabTraySelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/ToolbarScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class ToolbarScreen {
private let app: XCUIApplication
private let sel: ToolbarSelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/TopSitesScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class TopSitesScreen {
private let app: XCUIApplication
private let sel: TopSitesSelectorsSet
Expand Down
3 changes: 3 additions & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/TrackingProtectionScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class TrackingProtectionScreen {
private let app: XCUIApplication
private let sel: TrackingProtectionSelectorsSet
Expand All @@ -13,12 +14,14 @@ final class TrackingProtectionScreen {
self.sel = selectors
}

@MainActor
func assertTrackingProtectionSwitchIsEnabled() {
let toggle = sel.TRACKING_PROTECTION_SWITCH.element(in: app)
BaseTestCase().mozWaitForElementToExist(toggle)
XCTAssertTrue(toggle.isEnabled, "Expected Tracking Protection switch to be enabled")
}

@MainActor
func assertTrackingProtectionSwitchIsDisabled() {
let toggle = sel.TRACKING_PROTECTION_SWITCH.element(in: app)
BaseTestCase().mozWaitForElementToExist(toggle)
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/ViewCreditCardScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class ViewCreditCardScreen {
private let app: XCUIApplication
private let sel: ViewCreditCardSelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/WebFormScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// 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/

@MainActor
final class WebFormScreen {
private let app: XCUIApplication
private let webForm: WebFormSelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/WebsiteDataScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class WebsiteDataScreen {
private let app: XCUIApplication
private let sel: WebsiteDataSelectorsSet
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/PageScreens/ZoomBarScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import XCTest

@MainActor
final class ZoomBarScreen {
private let app: XCUIApplication
private let sel: ZoomBarSelectorsSet
Expand Down
2 changes: 2 additions & 0 deletions firefox-ios/firefox-ios-tests/Tests/XCUITests/Selectors/SelectorHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ struct Selector {
// Resolver
extension Selector {
// Return an element from the selector.
@MainActor
func element(in app: XCUIApplication) -> XCUIElement {
switch strategy {
case .buttonById:
Expand Down Expand Up @@ -72,6 +73,7 @@ extension Selector {
}
}

@MainActor
func query(in app: XCUIApplication) -> XCUIElementQuery {
switch strategy {
case .buttonById:
Expand Down