Make tests less flaky (#86)

Author: MortenGregersen

Sources/Fluxor/Store.swift

@@ -31,7 +31,6 @@ open class Store<State, Environment>: ObservableObject {
     /// The environment passed to the `Effects`. The `Environment` can contain services and other dependencies.
     public let environment: Environment
     internal private(set) var stateHash = UUID()
-    private var stateHashSink: AnyCancellable!
     private let actions = PassthroughSubject<Action, Never>()
     private var reducers = [KeyedReducer<State>]()
     private var effects = [String: [AnyCancellable]]()
@@ -49,7 +48,6 @@ open class Store<State, Environment>: ObservableObject {
     public init(initialState: State, environment: Environment, reducers: [Reducer<State>] = []) {
         state = initialState
         self.environment = environment
-        stateHashSink = $state.sink { _ in self.stateHash = UUID() }
         reducers.forEach(register(reducer:))
     }
 
@@ -68,6 +66,7 @@ open class Store<State, Environment>: ObservableObject {
         let oldState = state
         var newState = oldState
         reducers.forEach { $0.reduce(&newState, action) }
+        stateHash = UUID()
         state = newState
         interceptors.forEach { $0.actionDispatched(action: action, oldState: oldState, newState: newState) }
         actions.send(action)

Sources/FluxorTestSupport/MockStore.swift

@@ -32,9 +32,7 @@ public class MockStore<State, Environment>: Store<State, Environment> {
      - Parameter effects: The `Effect`s to register
      */
     public override init(initialState: State, environment: Environment, reducers: [Reducer<State>] = []) {
-        let reducers = reducers + [Reducer(ReduceOn(setState) { state, action in
-            state = action.payload
-        })]
+        let reducers = reducers + [Reducer(ReduceOn(setState) { state, action in state = action.payload })]
         super.init(initialState: initialState, environment: environment, reducers: reducers)
         super.register(interceptor: self.testInterceptor)
     }

Tests/FluxorSwiftUITests/ObservableValueTests.swift

@@ -11,13 +11,18 @@ import XCTest
 class ObservableValueTests: XCTestCase {
     private let counterSelector = Selector(keyPath: \TestState.counter)
     private let increment = ActionTemplate(id: "Increment", payloadType: Int.self)
-    private lazy var store = Store(initialState: TestState(), reducers: [
-        Reducer<TestState>(
-            ReduceOn(increment) { state, action in
-                state.counter += action.payload
-            }
-        )
-    ])
+    private var store: Store<TestState, Void>!
+
+    override func setUp() {
+        super.setUp()
+        store = Store(initialState: .init(), reducers: [
+            Reducer<TestState>(
+                ReduceOn(increment) { state, action in
+                    state.counter += action.payload
+                }
+            )
+        ])
+    }
 
     func testBindingWithOneActionTemplate() {
         // Given

Tests/FluxorTests/MockStoreTests.swift

@@ -53,8 +53,9 @@ class MockStoreTests: XCTestCase {
         // When
         store.setState(newState: TestState(counter: 123))
         // Then
+        XCTAssertEqual(store.selectCurrent(selector), value)
         wait(for: [expectation1], timeout: 5)
-        XCTAssertNotNil(cancellable1)
+        cancellable1.cancel()
 
         // Given
         let newValue = 42