Allow prepareDependencies to override context

pointfreeco · Jan 9, 2025 · 10187ba · 10187ba
1 parent 38c5ef0
commit 10187ba
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/Sources/Dependencies/DependencyValues.swift b/Sources/Dependencies/DependencyValues.swift
@@ -235,7 +235,15 @@ public struct DependencyValues: Sendable {
       else {
         let context =
           self.storage[ObjectIdentifier(DependencyContextKey.self)] as? DependencyContext
-          ?? defaultContext
+          ?? self.cachedValues.value(
+            for: DependencyContextKey.self,
+            context: defaultContext,
+            fileID: fileID,
+            filePath: filePath,
+            function: function,
+            line: line,
+            column: column
+          )
 
         switch context {
         case .live, .preview:

diff --git a/Tests/DependenciesTests/DependencyValuesTests.swift b/Tests/DependenciesTests/DependencyValuesTests.swift
@@ -736,6 +736,16 @@ final class DependencyValuesTests: XCTestCase {
     XCTAssertEqual(now, Date(timeIntervalSinceReferenceDate: 0))
   }
 
+  func testPrepareDependencies_setsLiveContext() {
+    prepareDependencies {
+      $0.context = .live
+    }
+    @Dependency(\.context) var context
+    XCTAssertEqual(context, .live)
+    @Dependency(FullDependency.self) var client
+    XCTAssertEqual(client.value, FullDependency.liveValue.value)
+  }
+
   func testPrepareDependencies_setsDependency_LiveContext() {
     withDependencies {
       $0.context = .live
@@ -844,19 +854,6 @@ final class DependencyValuesTests: XCTestCase {
     }
   #endif
 
-  #if DEBUG && !os(Linux) && !os(WASI) && !os(Windows)
-    func testPrepareDependencies_PrepareContext() {
-      prepareDependencies { $0.context = .live }
-
-      XCTTODO(
-        """
-        Currently 'context' cannot be overridden with 'prepareDependencies'.
-        """)
-      @Dependency(\.date) var date
-      _ = date()
-    }
-  #endif
-
   func testPrepareDependencies_setDependencyEndpoint() {
     prepareDependencies {
       $0[ClientWithEndpoint.self].get = { @Sendable in 42 }