diff --git a/Packages/Feature/Tests/FeatureTests/CountryListErrorTests.swift b/Packages/Feature/Tests/FeatureTests/CountryListErrorTests.swift index d1ba2da..ed89595 100644 --- a/Packages/Feature/Tests/FeatureTests/CountryListErrorTests.swift +++ b/Packages/Feature/Tests/FeatureTests/CountryListErrorTests.swift @@ -12,7 +12,7 @@ import Mockingbird import ViewModels final class CountryListErrorTests: QuickSpec { - override func spec() { + override class func spec() { describe("CountryListError") { var container: Container! var viewModel: CountryListViewModel! diff --git a/Packages/Logic/Sources/Logic/DI/Container+BusinessLogic.swift b/Packages/Logic/Sources/Logic/DI/Container+BusinessLogic.swift index 2e01fce..62ed987 100644 --- a/Packages/Logic/Sources/Logic/DI/Container+BusinessLogic.swift +++ b/Packages/Logic/Sources/Logic/DI/Container+BusinessLogic.swift @@ -19,12 +19,4 @@ public extension Container { return self } - - func injectBusinessLogicRepositories() -> Container { - self.autoregister(CountryListRepository.self, initializer: CountryListRepository.init).inObjectScope(.container) - self.autoregister(CountryDetailsRepository.self, initializer: CountryDetailsRepository.init).inObjectScope(.container) - self.autoregister(ServerStatusPushBasedRepository.self, initializer: ServerStatusPushBasedRepository.init).inObjectScope(.container) - - return self - } } diff --git a/Packages/Logic/Tests/LogicTests/CountryDetailsLogicTests.swift b/Packages/Logic/Tests/LogicTests/CountryDetailsLogicTests.swift index d5672de..f57ce15 100644 --- a/Packages/Logic/Tests/LogicTests/CountryDetailsLogicTests.swift +++ b/Packages/Logic/Tests/LogicTests/CountryDetailsLogicTests.swift @@ -20,7 +20,7 @@ import RepositoriesMocks @testable import Logic final class CountryDetailsLogicTests: QuickSpec { - override func spec() { + override class func spec() { describe("CountryDetailsLogic") { var container: Container! var logic: CountryDetailsLogic! diff --git a/Packages/Logic/Tests/LogicTests/CountryListLogicTests.swift b/Packages/Logic/Tests/LogicTests/CountryListLogicTests.swift index 06fbc3e..ca44840 100644 --- a/Packages/Logic/Tests/LogicTests/CountryListLogicTests.swift +++ b/Packages/Logic/Tests/LogicTests/CountryListLogicTests.swift @@ -19,7 +19,7 @@ import Mockingbird @testable import Logic final class CountryListLogicTests: QuickSpec { - override func spec() { + override class func spec() { describe("CountryListLogic") { var container: Container! var logic: CountryListLogic! diff --git a/Packages/Repositories/Tests/RepositoriesTests/CountryDetailsRepositoryTests.swift b/Packages/Repositories/Tests/RepositoriesTests/CountryDetailsRepositoryTests.swift index cd51738..4af34ea 100644 --- a/Packages/Repositories/Tests/RepositoriesTests/CountryDetailsRepositoryTests.swift +++ b/Packages/Repositories/Tests/RepositoriesTests/CountryDetailsRepositoryTests.swift @@ -21,7 +21,7 @@ import XCTest @testable import Repositories final class CountryDetailsRepositoryTests: QuickSpec { - override func spec() { + override class func spec() { describe("CountryDetailsRepository") { var container: Container! var repository: CountryDetailsRepository! diff --git a/Packages/Repositories/Tests/RepositoriesTests/CountryListRepositoryTests.swift b/Packages/Repositories/Tests/RepositoriesTests/CountryListRepositoryTests.swift index ed5f692..26198f0 100644 --- a/Packages/Repositories/Tests/RepositoriesTests/CountryListRepositoryTests.swift +++ b/Packages/Repositories/Tests/RepositoriesTests/CountryListRepositoryTests.swift @@ -18,7 +18,7 @@ import Mockingbird import InterfaceMocks final class CountryListRepositoryTests: QuickSpec { - override func spec() { + override class func spec() { describe("CountryListRepository") { var container: Container! var repository: CountryListRepository! diff --git a/Packages/Utils/Sources/UtilsTestExtensions/Nimble+Extensions.swift b/Packages/Utils/Sources/UtilsTestExtensions/Nimble+Extensions.swift index 41a5809..5a17659 100644 --- a/Packages/Utils/Sources/UtilsTestExtensions/Nimble+Extensions.swift +++ b/Packages/Utils/Sources/UtilsTestExtensions/Nimble+Extensions.swift @@ -8,12 +8,12 @@ import Foundation import Nimble -public func beApproximately(_ of: Date) -> Predicate { +public func beApproximately(_ of: Date) -> Nimble.Predicate { return beWithin(10, of: of) } -public func beWithin(_ interval: TimeInterval, of: Date) -> Predicate { - return Predicate.define("be ") { expression, message in +public func beWithin(_ interval: TimeInterval, of: Date) -> Nimble.Predicate { + return Nimble.Predicate.define("be ") { expression, message in guard let actual = try expression.evaluate() else { return PredicateResult(status: .fail, message: message) } @@ -28,7 +28,7 @@ public func beWithin(_ interval: TimeInterval, of: Date) -> Predicate { #if !os(macOS) import UIKit -public func beSameImage(_ expectedData: UIImage) -> Predicate { +public func beSameImage(_ expectedData: UIImage) -> Nimble.Predicate { return Predicate.define("be ") { expression, message in guard let actualData = try expression.evaluate() else { return PredicateResult(status: .fail, message: message) @@ -43,8 +43,8 @@ public func beSameImage(_ expectedData: UIImage) -> Predicate { } #else import AppKit -public func beSameImage(_ expectedData: NSImage) -> Predicate { - return Predicate.define("be ") { expression, message in +public func beSameImage(_ expectedData: NSImage) -> Nimble.Predicate { + return Nimble.Predicate.define("be ") { expression, message in guard let actualData = try expression.evaluate() else { return PredicateResult(status: .fail, message: message) } diff --git a/Packages/Utils/Sources/UtilsTestExtensions/Quick+Extensions.swift b/Packages/Utils/Sources/UtilsTestExtensions/Quick+Extensions.swift index bc2874f..67a8e77 100644 --- a/Packages/Utils/Sources/UtilsTestExtensions/Quick+Extensions.swift +++ b/Packages/Utils/Sources/UtilsTestExtensions/Quick+Extensions.swift @@ -6,7 +6,7 @@ import CombineSchedulers // swiftlint:disable pss_forced_try public func runAfterBeforeEach(_ closure: @escaping BeforeExampleClosure) { - justBeforeEach(closure) + QuickSpec.justBeforeEach(closure) } @discardableResult @@ -89,7 +89,7 @@ public func waitNext(_ publisher: AnyPublisher, //} public func asyncBeforeEach(_ closure: @MainActor @escaping (ExampleMetadata) async -> Void) { - beforeEach({ exampleMetadata in + QuickSpec.beforeEach({ exampleMetadata in let expectation = QuickSpec.current.expectation(description: "asyncBeforeEach") Task { await closure(exampleMetadata) @@ -100,7 +100,7 @@ public func asyncBeforeEach(_ closure: @MainActor @escaping (ExampleMetadata) as } public func asyncAfterEach(_ closure: @MainActor @escaping (ExampleMetadata) async -> Void) { - afterEach({ exampleMetadata in + QuickSpec.afterEach({ exampleMetadata in let expectation = QuickSpec.current.expectation(description: "asyncAfterEach") Task { await closure(exampleMetadata) diff --git a/Packages/ViewModels/Tests/ViewModelsTests/CountryDetailsViewModelTests.swift b/Packages/ViewModels/Tests/ViewModelsTests/CountryDetailsViewModelTests.swift index cee3422..8daf04e 100644 --- a/Packages/ViewModels/Tests/ViewModelsTests/CountryDetailsViewModelTests.swift +++ b/Packages/ViewModels/Tests/ViewModelsTests/CountryDetailsViewModelTests.swift @@ -20,7 +20,7 @@ import RepositoriesMocks @testable import ViewModels final class CountryDetailsViewModelTests: QuickSpec { - override func spec() { + override class func spec() { describe("CountryDetailsViewModel") { var container: Container! var viewModel: CountryDetailsViewModel! diff --git a/Packages/ViewModels/Tests/ViewModelsTests/CountryListViewModelTests.swift b/Packages/ViewModels/Tests/ViewModelsTests/CountryListViewModelTests.swift index 3a76d90..eaac7f1 100644 --- a/Packages/ViewModels/Tests/ViewModelsTests/CountryListViewModelTests.swift +++ b/Packages/ViewModels/Tests/ViewModelsTests/CountryListViewModelTests.swift @@ -20,7 +20,7 @@ import Mockingbird @testable import ViewModels final class CountryListViewModelTests: QuickSpec { - override func spec() { + override class func spec() { describe("CountryListViewModelTests") { var container: Container! var viewModel: CountryListViewModel! diff --git a/TravelAdvisories.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/TravelAdvisories.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 5ba2ada..5c535c4 100644 --- a/TravelAdvisories.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/TravelAdvisories.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -78,7 +78,7 @@ "location" : "https://github.com/Quick/Quick.git", "state" : { "branch" : "main", - "revision" : "4a2ca8d680f933f4fbf7b92e4cfa510aceb06d94" + "revision" : "8a9dd006cbe8477f9a492365568f4fde74f469f7" } }, { diff --git a/TravelAdvisories.xcodeproj/xcshareddata/xcschemes/TravelAdvisories (iOS).xcscheme b/TravelAdvisories.xcodeproj/xcshareddata/xcschemes/TravelAdvisories (iOS).xcscheme index 7aa73ff..2c36f6f 100644 --- a/TravelAdvisories.xcodeproj/xcshareddata/xcschemes/TravelAdvisories (iOS).xcscheme +++ b/TravelAdvisories.xcodeproj/xcshareddata/xcschemes/TravelAdvisories (iOS).xcscheme @@ -29,7 +29,7 @@ shouldUseLaunchSchemeArgsEnv = "YES"> + skipped = "NO"> + skipped = "NO"> + skipped = "NO"> + skipped = "NO"> + skipped = "NO"> + skipped = "NO"> + skipped = "NO"> + skipped = "NO"> + skipped = "NO"> + skipped = "NO"> + + + +