@@ -24,9 +24,8 @@ protocol RootStateDriving {
2424}
2525
2626struct RootStateSnapshot : Equatable {
27- let showAlert : Bool
28- let alertTitle : String
29- let alertMessage : String
27+ let alertTitle : String ?
28+ let alertMessage : String ?
3029 let isNetworkConnected : Bool
3130 let signIn : Bool ?
3231 let theme : SystemTheme
@@ -38,9 +37,8 @@ struct RootStoreTestAdapter: RootStateDriving {
3837
3938 var snapshot : RootStateSnapshot {
4039 RootStateSnapshot (
41- showAlert: store. state. showAlert,
42- alertTitle: store. state. alertTitle,
43- alertMessage: store. state. alertMessage,
40+ alertTitle: store. state. alert. map { String ( state: $0. title) } ,
41+ alertMessage: store. state. alert? . message. map { String ( state: $0) } ,
4442 isNetworkConnected: store. state. isNetworkConnected,
4543 signIn: store. state. signIn,
4644 theme: store. state. theme
@@ -78,7 +76,11 @@ struct RootStoreTestAdapter: RootStateDriving {
7876 }
7977
8078 func setAlert( _ isPresented: Bool ) async {
81- await store. send ( . view( . setAlert( isPresented) ) )
79+ if isPresented {
80+ await store. send ( . store( . networkStatusChanged( false ) ) )
81+ } else {
82+ await store. send ( . alert( . dismiss) )
83+ }
8284 }
8385
8486 func networkStatusChanged( _ isConnected: Bool ) async {
@@ -107,7 +109,6 @@ func verifyNetworkDisconnectedAlert(adapter: some RootStateDriving) async {
107109 #expect(
108110 adapter. snapshot
109111 == RootStateSnapshot (
110- showAlert: true ,
111112 alertTitle: String ( localized: " root_network_disconnected_title " ) ,
112113 alertMessage: String ( localized: " root_network_disconnected_message " ) ,
113114 isNetworkConnected: false ,
@@ -125,9 +126,8 @@ func verifySetAlert(adapter: some RootStateDriving) async {
125126 #expect(
126127 adapter. snapshot
127128 == RootStateSnapshot (
128- showAlert: false ,
129- alertTitle: String ( localized: " root_network_disconnected_title " ) ,
130- alertMessage: String ( localized: " root_network_disconnected_message " ) ,
129+ alertTitle: nil ,
130+ alertMessage: nil ,
131131 isNetworkConnected: false ,
132132 signIn: nil ,
133133 theme: . automatic
@@ -140,7 +140,7 @@ func verifyThemeUpdate(adapter: some RootStateDriving) async {
140140 await adapter. setTheme ( . dark)
141141
142142 #expect( adapter. snapshot. theme == . dark)
143- #expect( ! adapter. snapshot. showAlert )
143+ #expect( adapter. snapshot. alertTitle == nil )
144144}
145145
146146@MainActor
@@ -176,13 +176,12 @@ func verifyObservedInitialValues(adapter: some RootStateDriving) async {
176176 return snapshot. signIn == false
177177 && !snapshot. isNetworkConnected
178178 && snapshot. theme == . dark
179- && snapshot. showAlert
179+ && snapshot. alertTitle == String ( localized : " root_network_disconnected_title " )
180180 }
181181
182182 #expect(
183183 adapter. snapshot
184184 == RootStateSnapshot (
185- showAlert: true ,
186185 alertTitle: String ( localized: " root_network_disconnected_title " ) ,
187186 alertMessage: String ( localized: " root_network_disconnected_message " ) ,
188187 isNetworkConnected: false ,
0 commit comments