Migrate to ViewInspector 0.8.1

Author: Alexey Naumov

CountriesSwiftUI.xcodeproj/project.pbxproj

@@ -1013,7 +1013,7 @@
 			repositoryURL = "https://github.com/nalexn/ViewInspector";
 			requirement = {
 				kind = exactVersion;
-				version = 0.7.4;
+				version = 0.8.1;
 			};
 		};
 		F6E7ACE023F5D1EC00AB48AB /* XCRemoteSwiftPackageReference "EnvironmentOverrides" */ = {

CountriesSwiftUI/UI/RootViewModifier.swift

@@ -15,15 +15,13 @@ struct RootViewAppearance: ViewModifier {
 
     @Environment(\.injected) private var injected: DIContainer
     @State private var isActive: Bool = false
-    let inspection = PassthroughSubject<((AnyView) -> Void), Never>()
+    internal let inspection = Inspection<Self>()
 
     func body(content: Content) -> some View {
         content
             .blur(radius: isActive ? 0 : 10)
             .onReceive(stateUpdate) { self.isActive = $0 }
-            .onReceive(inspection) { callback in
-                callback(AnyView(self.body(content: content)))
-            }
+            .onReceive(inspection.notice) { self.inspection.visit(self, $0) }
     }
 
     private var stateUpdate: AnyPublisher<Bool, Never> {

CountriesSwiftUI/Utilities/Helpers.swift

@@ -39,7 +39,7 @@ extension Result {
 
 // MARK: - View Inspection helper
 
-internal final class Inspection<V> where V: View {
+internal final class Inspection<V> {
     let notice = PassthroughSubject<UInt, Never>()
     var callbacks = [UInt: (V) -> Void]()
 

UnitTests/UI/RootViewAppearanceTests.swift

@@ -11,27 +11,18 @@ import SwiftUI
 import ViewInspector
 @testable import CountriesSwiftUI
 
-private typealias ModifierContent = _ViewModifier_Content<RootViewAppearance>
-
-extension ModifierContent: Inspectable { }
+extension RootViewAppearance: Inspectable { }
 
 final class RootViewAppearanceTests: XCTestCase {
 
     func test_blur_whenInactive() {
         let sut = RootViewAppearance()
-        let exp = XCTestExpectation(description: #function)
         let container = DIContainer(appState: .init(AppState()),
                                     interactors: .mocked())
         XCTAssertFalse(container.appState.value.system.isActive)
-        DispatchQueue.main.async {
-            sut.inspection.send { body in
-                body.inspect { content in
-                    XCTAssertEqual(try content.anyView()
-                        .view(ModifierContent.self).blur().radius, 10)
-                }
-                ViewHosting.expel()
-                exp.fulfill()
-            }
+        let exp = sut.inspection.inspect { modifier in
+            let content = try modifier.viewModifierContent()
+            XCTAssertEqual(try content.blur().radius, 10)
         }
         let view = EmptyView().modifier(sut)
             .environment(\.injected, container)
@@ -41,20 +32,13 @@ final class RootViewAppearanceTests: XCTestCase {
 
     func test_blur_whenActive() {
         let sut = RootViewAppearance()
-        let exp = XCTestExpectation(description: #function)
         let container = DIContainer(appState: .init(AppState()),
                                     interactors: .mocked())
         container.appState[\.system.isActive] = true
         XCTAssertTrue(container.appState.value.system.isActive)
-        DispatchQueue.main.async {
-            sut.inspection.send { body in
-                body.inspect { content in
-                    XCTAssertEqual(try content.anyView()
-                        .view(ModifierContent.self).blur().radius, 0)
-                }
-                ViewHosting.expel()
-                exp.fulfill()
-            }
+        let exp = sut.inspection.inspect { modifier in
+            let content = try modifier.viewModifierContent()
+            XCTAssertEqual(try content.blur().radius, 0)
         }
         let view = EmptyView().modifier(sut)
             .environment(\.injected, container)