Fix onConsume (#470)

VergeGroup · Mar 23, 2024 · 7a79947 · 7a79947
1 parent 419af19
commit 7a79947
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Sources/Verge/Library/EventEmitter.swift b/Sources/Verge/Library/EventEmitter.swift
@@ -111,8 +111,8 @@ open class EventEmitter<Event: EventEmitterEventType>: EventEmitterType, @unchec
 
         for subscriber in capturedSubscribers {
           subscriber.1(event)
-          event.onComsume()
         }
+        event.onComsume()
       }
 
       /**

diff --git a/Sources/Verge/Store/Store.swift b/Sources/Verge/Store/Store.swift
@@ -324,7 +324,7 @@ extension Store {
 extension Store {
 
   public func waitUntilAllEventConsumed() async {
-    await withUnsafeContinuation { c in
+    await withCheckedContinuation { c in
       accept(.waiter({
         c.resume()
       }))

diff --git a/Tests/VergeTests/StoreAndDerivedTests.swift b/Tests/VergeTests/StoreAndDerivedTests.swift
@@ -31,12 +31,13 @@ final class StoreAndDerivedTests: XCTestCase {
           }
         }
 
+
         XCTAssertEqual(store.state.count, 100)
 
+        await store.waitUntilAllEventConsumed()
         // potentially it fails as EventEmitter's behavior
         // If EventEmitter's buffer is not empty, commit function escape from the stack by only adding.
-//        XCTAssertEqual(countDerived.state.primitive, 100)
-        XCTAssertNotEqual(countDerived.state.primitive, 100)
+        XCTAssertEqual(countDerived.state.primitive, 100)
       }
 
     }