Skip to content

Commit 1a84423

Browse files
lmarceaulmarceau
committed
Uhhh, what did I do. Why I missed those
1 parent db99926 commit 1a84423

45 files changed

Lines changed: 184 additions & 197 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎firefox-ios/Client.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,6 @@
629629
5A70EF10295DFD4900790249 /* Common in Frameworks */ = {isa = PBXBuildFile; productRef = 5A70EF0F295DFD4900790249 /* Common */; };
630630
5A70EF16295DFD9000790249 /* Common in Frameworks */ = {isa = PBXBuildFile; productRef = 5A70EF15295DFD9000790249 /* Common */; };
631631
5A70EF19295E2E1600790249 /* DependencyHelperMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A70EF18295E2E1600790249 /* DependencyHelperMock.swift */; };
632-
5A70EF1D295E3C3500790249 /* TestSetup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A70EF1C295E3C3500790249 /* TestSetup.swift */; };
633632
5A70EF1F295E3DFC00790249 /* UnitTestAppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A70EF1E295E3DFC00790249 /* UnitTestAppDelegate.swift */; };
634633
5A70EF21295E3E0B00790249 /* UnitTestSceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A70EF20295E3E0B00790249 /* UnitTestSceneDelegate.swift */; };
635634
5A8017E029CE15D90047120D /* TabManagerImplementation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A8017DF29CE15D90047120D /* TabManagerImplementation.swift */; };
@@ -1350,8 +1349,8 @@
13501349
AAB4321B2E8187190075E47F /* RecentSearchProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAB4321A2E8187130075E47F /* RecentSearchProvider.swift */; };
13511350
AAB4321D2E8189390075E47F /* DefaultRecentSearchProviderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAB4321C2E8189310075E47F /* DefaultRecentSearchProviderTests.swift */; };
13521351
AAB434062E82F0600075E47F /* MockTrendingSearchProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAB434052E82F05C0075E47F /* MockTrendingSearchProvider.swift */; };
1353-
AAB5B7882EE077BB0051EF6E /* TranslationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAB5B7872EE077BB0051EF6E /* TranslationTests.swift */; };
13541352
AAB5AF382EDDCF600051EF6E /* MockLocaleProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAB5AF372EDDCF5A0051EF6E /* MockLocaleProvider.swift */; };
1353+
AAB5B7882EE077BB0051EF6E /* TranslationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAB5B7872EE077BB0051EF6E /* TranslationTests.swift */; };
13551354
AAD1CD872EAABA8100BEC90A /* TranslationsConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAD1CD862EAABA7C00BEC90A /* TranslationsConfiguration.swift */; };
13561355
AAD861A82E9E748700F6E0E0 /* TranslationSetting.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAD861A72E9E748100F6E0E0 /* TranslationSetting.swift */; };
13571356
AAD861AB2E9E75AB00F6E0E0 /* TranslationSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAD861AA2E9E75A100F6E0E0 /* TranslationSettingsViewController.swift */; };
@@ -8314,7 +8313,6 @@
83148313
5A64225029CB506500EEC3E5 /* TabManagerDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabManagerDelegate.swift; sourceTree = "<group>"; };
83158314
5A679E4A2B239FAE004F2B0D /* TabPeekViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabPeekViewController.swift; sourceTree = "<group>"; };
83168315
5A70EF18295E2E1600790249 /* DependencyHelperMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DependencyHelperMock.swift; sourceTree = "<group>"; };
8317-
5A70EF1C295E3C3500790249 /* TestSetup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestSetup.swift; sourceTree = "<group>"; };
83188316
5A70EF1E295E3DFC00790249 /* UnitTestAppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnitTestAppDelegate.swift; sourceTree = "<group>"; };
83198317
5A70EF20295E3E0B00790249 /* UnitTestSceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnitTestSceneDelegate.swift; sourceTree = "<group>"; };
83208318
5A8017DF29CE15D90047120D /* TabManagerImplementation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabManagerImplementation.swift; sourceTree = "<group>"; };
@@ -9567,8 +9565,8 @@
95679565
AAB4321A2E8187130075E47F /* RecentSearchProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecentSearchProvider.swift; sourceTree = "<group>"; };
95689566
AAB4321C2E8189310075E47F /* DefaultRecentSearchProviderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultRecentSearchProviderTests.swift; sourceTree = "<group>"; };
95699567
AAB434052E82F05C0075E47F /* MockTrendingSearchProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockTrendingSearchProvider.swift; sourceTree = "<group>"; };
9570-
AAB5B7872EE077BB0051EF6E /* TranslationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TranslationTests.swift; sourceTree = "<group>"; };
95719568
AAB5AF372EDDCF5A0051EF6E /* MockLocaleProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockLocaleProvider.swift; sourceTree = "<group>"; };
9569+
AAB5B7872EE077BB0051EF6E /* TranslationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TranslationTests.swift; sourceTree = "<group>"; };
95729570
AAD1CD862EAABA7C00BEC90A /* TranslationsConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TranslationsConfiguration.swift; sourceTree = "<group>"; };
95739571
AAD861A72E9E748100F6E0E0 /* TranslationSetting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TranslationSetting.swift; sourceTree = "<group>"; };
95749572
AAD861AA2E9E75A100F6E0E0 /* TranslationSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TranslationSettingsViewController.swift; sourceTree = "<group>"; };
@@ -13747,7 +13745,6 @@
1374713745
E14BF33D2950B1230039758D /* MailProvidersTests.swift */,
1374813746
E1463D032982D0240074E16E /* NotificationManagerTests.swift */,
1374913747
8AEE284A276A973400C7104D /* RatingPromptManagerTests.swift */,
13750-
5A70EF1C295E3C3500790249 /* TestSetup.swift */,
1375113748
);
1375213749
path = Helpers;
1375313750
sourceTree = "<group>";
@@ -14847,7 +14844,6 @@
1484714844
isa = PBXGroup;
1484814845
children = (
1484914846
21A7C44D283539170071D996 /* IntroViewModel.swift */,
14850-
81055B552BAB7CE200E166B3 /* OnboardingMultipeChoiceButtonModel.swift */,
1485114847
8C51ED6F2DE0A4D700B3E58A /* OnboardingKitCardInfoModel.swift */,
1485214848
8C51ED712DE0A5B500B3E58A /* OnboardingKitViewModel.swift */,
1485314849
435D660423D794B90046EFA2 /* UpdateViewModel.swift */,
@@ -18986,7 +18982,6 @@
1898618982
8A89046D2D52874600A5BB29 /* SyncedTabCell.swift in Sources */,
1898718983
8A4490952BF3C42B00E7E682 /* MicrosurveyConfirmationView.swift in Sources */,
1898818984
1DA6F6512B48B42900BB5AD6 /* WindowEventCoordinator.swift in Sources */,
18989-
ED07C0E62CCACD7E006C0627 /* Locale+possibilitiesForLanguageIdentifier.swift in Sources */,
1899018985
437A857827E43FE100E42764 /* FxAWebViewTelemetry.swift in Sources */,
1899118986
613489A32D942A020009AF01 /* ToastTelemetry.swift in Sources */,
1899218987
C7F051692DB2F38000EC52C0 /* ContextMenuPreviewViewController.swift in Sources */,
@@ -19459,7 +19454,6 @@
1945919454
ED6D46E02D3573F80045E4ED /* TitleActivityItemProviderTests.swift in Sources */,
1946019455
C736C9C72E9D7C4800658045 /* StoriesFeedStateTests.swift in Sources */,
1946119456
C8501F5128510DA1003B09AB /* WallpaperMigrationUtilityTests.swift in Sources */,
19462-
5A70EF1D295E3C3500790249 /* TestSetup.swift in Sources */,
1946319457
E1442FDA294782F7003680B0 /* UIPasteboard+Extension.swift in Sources */,
1946419458
C2D80BEB2AAF395200CDF7A9 /* CredentialAutofillCoordinatorTests.swift in Sources */,
1946519459
F98CB66E2A4123F1005F38E9 /* EnhancedTrackingProtectionMenuVMTests.swift in Sources */,

‎firefox-ios/firefox-ios-tests/Tests/ClientTests/BrowserViewControllerStateTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ final class BrowserViewControllerStateTests: XCTestCase, StoreTestUtility {
1313

1414
override func setUp() async throws {
1515
try await super.setUp()
16-
await DependencyHelperMock().bootstrapDependencies()
16+
DependencyHelperMock().bootstrapDependencies()
1717
setupStore()
1818
}
1919

‎firefox-ios/firefox-ios-tests/Tests/ClientTests/BrowserViewControllerTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class BrowserViewControllerTests: XCTestCase, StoreTestUtility {
2727
setIsSwipingTabsEnabled(false)
2828
setIsHostedSummarizerEnabled(false)
2929
tabManager = MockTabManager()
30-
await DependencyHelperMock().bootstrapDependencies(injectedTabManager: tabManager)
30+
DependencyHelperMock().bootstrapDependencies(injectedTabManager: tabManager)
3131

3232
profile = MockProfile()
3333
browserCoordinator = MockBrowserCoordinator()

‎firefox-ios/firefox-ios-tests/Tests/ClientTests/Coordinators/BrowserCoordinatorTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ final class BrowserCoordinatorTests: XCTestCase, FeatureFlaggable {
3030
let mockTabManager = MockTabManager()
3131
self.tabManager = mockTabManager
3232
profile = MockProfile()
33-
await DependencyHelperMock().bootstrapDependencies(injectedTabManager: mockTabManager)
33+
DependencyHelperMock().bootstrapDependencies(injectedTabManager: mockTabManager)
3434
LegacyFeatureFlagsManager.shared.initializeDeveloperFeatures(with: profile)
3535
setIsAppleSummarizerEnabled(false)
3636
setIsHostedSummarizerEnabled(false)

‎firefox-ios/firefox-ios-tests/Tests/ClientTests/Coordinators/EnhancedTrackingProtectionCoordinatorTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ final class EnhancedTrackingProtectionCoordinatorTests: XCTestCase {
2323
override func setUp() async throws {
2424
try await super.setUp()
2525
self.profile = MockProfile()
26-
await DependencyHelperMock().bootstrapDependencies()
26+
DependencyHelperMock().bootstrapDependencies()
2727
LegacyFeatureFlagsManager.shared.initializeDeveloperFeatures(with: profile)
2828
self.mockRouter = MockRouter(navigationController: MockNavigationController())
2929
self.routeBuilder = RouteBuilder()

‎firefox-ios/firefox-ios-tests/Tests/ClientTests/Coordinators/Launch/LaunchCoordinatorTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ final class LaunchCoordinatorTests: XCTestCase {
1717

1818
override func setUp() async throws {
1919
try await super.setUp()
20-
await DependencyHelperMock().bootstrapDependencies()
20+
DependencyHelperMock().bootstrapDependencies()
2121
profile = MockProfile()
2222
LegacyFeatureFlagsManager.shared.initializeDeveloperFeatures(with: profile)
2323
mockRouter = MockRouter(navigationController: MockNavigationController())

‎firefox-ios/firefox-ios-tests/Tests/ClientTests/Coordinators/SearchEngineSelectionCoordinatorTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ final class SearchEngineSelectionCoordinatorTests: XCTestCase {
1414

1515
override func setUp() async throws {
1616
try await super.setUp()
17-
await DependencyHelperMock().bootstrapDependencies()
17+
DependencyHelperMock().bootstrapDependencies()
1818
mockRouter = MockRouter(navigationController: MockNavigationController())
1919
mockParentCoordinator = MockParentCoordinator()
2020
}

‎firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/Browser/BrowserViewControllerWebViewDelegateTests.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@ class BrowserViewControllerWebViewDelegateTests: XCTestCase {
1818
}
1919
private lazy var allowBlockingUniversalLinksPolicy = WKNavigationActionPolicy(rawValue: allowPolicyRawValue + 2)
2020

21-
override func setUp() {
22-
super.setUp()
23-
DependencyHelperMock().bootstrapDependencies()
21+
override func setUp() async throws {
22+
try await super.setUp()
23+
await DependencyHelperMock().bootstrapDependencies()
2424
profile = MockProfile()
2525
LegacyFeatureFlagsManager.shared.initializeDeveloperFeatures(with: profile)
2626
tabManager = MockTabManager()
2727
fileManager = MockFileManager()
2828
setWebEngineIntegrationEnabled(false)
2929
}
3030

31-
override func tearDown() {
31+
override func tearDown() async throws {
3232
profile = nil
3333
tabManager = nil
3434
fileManager = nil
3535
DependencyHelperMock().reset()
36-
super.tearDown()
36+
try await super.tearDown()
3737
}
3838

3939
@MainActor

‎firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/Homepage/PrivateHomepageViewControllerTests.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ import Common
1111
final class PrivateHomepageViewControllerTests: XCTestCase {
1212
let windowUUID: WindowUUID = .XCTestDefaultUUID
1313

14-
override func setUp() {
15-
super.setUp()
14+
override func setUp() async throws {
15+
try await super.setUp()
1616
DependencyHelperMock().bootstrapDependencies()
1717
}
1818

19-
override func tearDown() {
19+
override func tearDown() async throws {
2020
DependencyHelperMock().reset()
21-
super.tearDown()
21+
try await super.tearDown()
2222
}
2323

2424
func testPrivateHomepageViewController_simpleCreation_hasNoLeaks() {

‎firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/Homepage/Redux/BookmarksSectionStateTests.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ import XCTest
1212
final class BookmarksSectionStateTests: XCTestCase {
1313
private var mockProfile: MockProfile!
1414

15-
override func setUp() {
16-
super.setUp()
15+
override func setUp() async throws {
16+
try await super.setUp()
1717
mockProfile = MockProfile()
18-
DependencyHelperMock().bootstrapDependencies()
18+
await DependencyHelperMock().bootstrapDependencies()
1919
LegacyFeatureFlagsManager.shared.initializeDeveloperFeatures(with: mockProfile)
2020
}
2121

22-
override func tearDown() {
22+
override func tearDown() async throws {
2323
DependencyHelperMock().reset()
2424
mockProfile = nil
25-
super.tearDown()
25+
try await super.tearDown()
2626
}
2727

2828
func tests_initialState_returnsExpectedState() {

0 commit comments

Comments
 (0)