#88: Fix tests failing for updated Loadable

nalexn · Nov 11, 2023 · 231a47f · 231a47f
1 parent b1ad1f4
commit 231a47f
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 15 deletions.
diff --git a/CountriesSwiftUI/Utilities/CancelBag.swift b/CountriesSwiftUI/Utilities/CancelBag.swift
@@ -10,10 +10,19 @@ import Combine
 
 final class CancelBag {
     fileprivate(set) var subscriptions = Set<AnyCancellable>()
+    private let equalToAny: Bool
+
+    init(equalToAny: Bool = false) {
+        self.equalToAny = equalToAny
+    }
 
     func cancel() {
         subscriptions.removeAll()
     }
+
+    func isEqual(to other: CancelBag) -> Bool {
+        return other === self || other.equalToAny || self.equalToAny
+    }
 }
 
 extension AnyCancellable {

diff --git a/CountriesSwiftUI/Utilities/Loadable.swift b/CountriesSwiftUI/Utilities/Loadable.swift
@@ -104,7 +104,7 @@ extension Loadable: Equatable where T: Equatable {
         switch (lhs, rhs) {
         case (.notRequested, .notRequested): return true
         case let (.isLoading(lhsV, lhsC), .isLoading(rhsV, rhsC)):
-            return lhsV == rhsV && lhsC === rhsC
+            return lhsV == rhsV && lhsC.isEqual(to: rhsC)
         case let (.loaded(lhsV), .loaded(rhsV)): return lhsV == rhsV
         case let (.failed(lhsE), .failed(rhsE)):
             return lhsE.localizedDescription == rhsE.localizedDescription

diff --git a/UnitTests/Interactors/CountriesInteractorTests.swift b/UnitTests/Interactors/CountriesInteractorTests.swift
@@ -60,7 +60,7 @@ final class LoadCountriesTests: CountriesInteractorTests {
         countries.updatesRecorder.sink { updates in
             XCTAssertEqual(updates, [
                 .notRequested,
-                .isLoading(last: nil, cancelBag: CancelBag()),
+                .isLoading(last: nil, cancelBag: .test),
                 .loaded(list.lazyList)
             ], removing: Country.prefixes)
             self.mockedWebRepo.verify()
@@ -93,7 +93,7 @@ final class LoadCountriesTests: CountriesInteractorTests {
         countries.updatesRecorder.sink { updates in
             XCTAssertEqual(updates, [
                 .notRequested,
-                .isLoading(last: nil, cancelBag: CancelBag()),
+                .isLoading(last: nil, cancelBag: .test),
                 .failed(error)
             ], removing: Country.prefixes)
             self.mockedWebRepo.verify()
@@ -126,7 +126,7 @@ final class LoadCountriesTests: CountriesInteractorTests {
         countries.updatesRecorder.sink { updates in
             XCTAssertEqual(updates, [
                 .notRequested,
-                .isLoading(last: nil, cancelBag: CancelBag()),
+                .isLoading(last: nil, cancelBag: .test),
                 .failed(error)
             ], removing: Country.prefixes)
             self.mockedWebRepo.verify()
@@ -163,7 +163,7 @@ final class LoadCountriesTests: CountriesInteractorTests {
         countries.updatesRecorder.sink { updates in
             XCTAssertEqual(updates, [
                 .notRequested,
-                .isLoading(last: nil, cancelBag: CancelBag()),
+                .isLoading(last: nil, cancelBag: .test),
                 .loaded(list.lazyList)
             ], removing: Country.prefixes)
             self.mockedWebRepo.verify()
@@ -199,7 +199,7 @@ final class LoadCountriesTests: CountriesInteractorTests {
         countries.updatesRecorder.sink { updates in
             XCTAssertEqual(updates, [
                 .notRequested,
-                .isLoading(last: nil, cancelBag: CancelBag()),
+                .isLoading(last: nil, cancelBag: .test),
                 .failed(error)
             ], removing: Country.prefixes)
             self.mockedWebRepo.verify()
@@ -236,7 +236,7 @@ final class LoadCountryDetailsTests: CountriesInteractorTests {
         details.updatesRecorder.sink { updates in
             XCTAssertEqual(updates, [
                 .notRequested,
-                .isLoading(last: nil, cancelBag: CancelBag()),
+                .isLoading(last: nil, cancelBag: .test),
                 .loaded(data.details)
             ], removing: Country.prefixes)
             self.mockedWebRepo.verify()
@@ -270,7 +270,7 @@ final class LoadCountryDetailsTests: CountriesInteractorTests {
         details.updatesRecorder.sink { updates in
             XCTAssertEqual(updates, [
                 .notRequested,
-                .isLoading(last: nil, cancelBag: CancelBag()),
+                .isLoading(last: nil, cancelBag: .test),
                 .failed(error)
             ], removing: Country.prefixes)
             self.mockedWebRepo.verify()
@@ -307,7 +307,7 @@ final class LoadCountryDetailsTests: CountriesInteractorTests {
         details.updatesRecorder.sink { updates in
             XCTAssertEqual(updates, [
                 .notRequested,
-                .isLoading(last: nil, cancelBag: CancelBag()),
+                .isLoading(last: nil, cancelBag: .test),
                 .failed(error)
             ], removing: Country.prefixes)
             self.mockedWebRepo.verify()
@@ -343,7 +343,7 @@ final class LoadCountryDetailsTests: CountriesInteractorTests {
         details.updatesRecorder.sink { updates in
             XCTAssertEqual(updates, [
                 .notRequested,
-                .isLoading(last: nil, cancelBag: CancelBag()),
+                .isLoading(last: nil, cancelBag: .test),
                 .loaded(data.details)
             ], removing: Country.prefixes)
             self.mockedWebRepo.verify()

diff --git a/UnitTests/Interactors/ImagesInteractorTests.swift b/UnitTests/Interactors/ImagesInteractorTests.swift
@@ -57,7 +57,7 @@ final class ImagesInteractorTests: XCTestCase {
         image.updatesRecorder.sink { updates in
             XCTAssertEqual(updates, [
                 .notRequested,
-                .isLoading(last: nil, cancelBag: CancelBag()),
+                .isLoading(last: nil, cancelBag: .test),
                 .loaded(self.testImage)
             ])
             self.verifyRepoActions()
@@ -76,7 +76,7 @@ final class ImagesInteractorTests: XCTestCase {
         image.updatesRecorder.sink { updates in
             XCTAssertEqual(updates, [
                 .notRequested,
-                .isLoading(last: nil, cancelBag: CancelBag()),
+                .isLoading(last: nil, cancelBag: .test),
                 .failed(error)
             ])
             self.verifyRepoActions()
@@ -95,7 +95,7 @@ final class ImagesInteractorTests: XCTestCase {
         image.updatesRecorder.sink { updates in
             XCTAssertEqual(updates, [
                 .loaded(self.testImage),
-                .isLoading(last: self.testImage, cancelBag: CancelBag()),
+                .isLoading(last: self.testImage, cancelBag: .test),
                 .failed(error)
             ])
             self.verifyRepoActions()

diff --git a/UnitTests/Utilities/LoadableTests.swift b/UnitTests/Utilities/LoadableTests.swift
@@ -61,8 +61,8 @@ final class LoadableTests: XCTestCase {
         ]
         let expect: [Loadable<String>] = [
             .notRequested,
-            .isLoading(last: nil, cancelBag: CancelBag()),
-            .isLoading(last: "5", cancelBag: CancelBag()),
+            .isLoading(last: nil, cancelBag: .test),
+            .isLoading(last: "5", cancelBag: .test),
             .loaded("7"),
             .failed(NSError.test)
         ]
@@ -100,3 +100,9 @@ final class LoadableTests: XCTestCase {
         XCTAssertEqual(ValueIsMissingError().localizedDescription, "Data is missing")
     }
 }
+
+extension CancelBag {
+    static var test: CancelBag {
+        return CancelBag(equalToAny: true)
+    }
+}