wip

pointfreeco · Sep 14, 2024 · 012a4cf · 012a4cf
1 parent 3d9810e
commit 012a4cf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/Tests/DependenciesTests/BaseTestCaseTests.swift b/Tests/DependenciesTests/BaseTestCaseTests.swift
@@ -1,6 +1,7 @@
 import Dependencies
 import XCTest
 
+#if !arch(wasm32)
 final class BaseTestCaseTests: DerivedBaseTestCase {
   override func setUp() async throws {
     try await super.setUp()
@@ -30,7 +31,9 @@ final class BaseTestCaseTests: DerivedBaseTestCase {
     XCTAssertEqual(DependencyValues._current.uuid(), .deadbeef)
   }
 }
+#endif
 
+#if !arch(wasm32)
 class DerivedBaseTestCase: BaseTestCase {
   override func setUp() async throws {
     try await super.setUp()
@@ -47,6 +50,7 @@ class DerivedBaseTestCase: BaseTestCase {
     }
   }
 }
+#endif
 
 class BaseTestCase: XCTestCase {
   override func setUp() async throws {
@@ -55,18 +59,15 @@ class BaseTestCase: XCTestCase {
     XCTAssertEqual(DependencyValues._current.uuid(), .deadbeef)
   }
 
+#if !arch(wasm32)
   override func invokeTest() {
     withDependencies {
-      // NB: It doesn't seem possible to detect a test context from Wasm:
-      //     https://github.com/swiftwasm/carton/issues/400
-      #if os(WASI)
-        $0.context = .test
-      #endif
       $0.uuid = .constant(.deadbeef)
     } operation: {
       super.invokeTest()
     }
   }
+#endif
 }
 
 extension UUID {

diff --git a/Tests/DependenciesTests/DependencyValuesTests.swift b/Tests/DependenciesTests/DependencyValuesTests.swift
@@ -400,15 +400,15 @@ final class DependencyValuesTests: XCTestCase {
 
     @MainActor
     func testEscapingInFeatureModel_InstanceVariablePropagated() async {
-      let expectation = self.expectation(description: "escape")
+      let finished = LockIsolated(false)
 
       @MainActor
       class FeatureModel /*: ObservableObject*/ {
         @Dependency(\.fullDependency) var fullDependency
-        func doSomething(expectation: XCTestExpectation) {
+        func doSomething(finished: LockIsolated<Bool>) {
           DispatchQueue.main.async {
             XCTAssertEqual(self.fullDependency.value, 42)
-            expectation.fulfill()
+            finished.withValue { $0 = true }
           }
         }
       }
@@ -419,8 +419,10 @@ final class DependencyValuesTests: XCTestCase {
         FeatureModel()
       }
 
-      model.doSomething(expectation: expectation)
-      await fulfillment(of: [expectation], timeout: 1)
+      model.doSomething(finished: finished)
+      while !finished.withValue({ $0 }) {
+        await Task.yield()
+      }
     }
 
     func testEscapingInFeatureModel_NotPropagated() async {