Skip to content

Commit df75f1c

Browse files
mbrandonwmluisbrown
authored andcommitted
Don't implicitly infer test context. (#1686)
(cherry picked from commit a7e2befc8fe76f88d611a29f3f2e08ea19120444) # Conflicts: # Tests/DependenciesTests/DependencyValuesTests.swift
1 parent 13f356c commit df75f1c

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Sources/Dependencies/DependencyValues.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,6 @@ struct CurrentDependency {
298298
private let defaultContext: DependencyContext = {
299299
if ProcessInfo.processInfo.environment["XCODE_RUNNING_FOR_PREVIEWS"] == "1" {
300300
return .preview
301-
} else if _XCTIsTesting {
302-
return .test
303301
} else {
304302
return .live
305303
}

Tests/DependenciesTests/DependencyValuesTests.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,19 @@ final class DependencyValuesTests: XCTestCase {
6868

6969
func testDependencyDefaultIsReused() {
7070
DependencyValues.withValue(\.self, .init()) {
71+
DependencyValues.withValue(\.context, .test) {
7172
@Dependency(\.reuseClient) var reuseClient: ReuseClient
7273

7374
XCTAssertEqual(reuseClient.count(), 0)
7475
reuseClient.setCount(42)
7576
XCTAssertEqual(reuseClient.count(), 42)
7677
}
7778
}
79+
}
7880

7981
func testDependencyDefaultIsReused_SegmentedByContext() {
8082
DependencyValues.withValue(\.self, .init()) {
83+
DependencyValues.withValue(\.context, .test) {
8184
@Dependency(\.reuseClient) var reuseClient: ReuseClient
8285

8386
XCTAssertEqual(reuseClient.count(), 0)
@@ -116,6 +119,7 @@ final class DependencyValuesTests: XCTestCase {
116119
XCTAssertEqual(reuseClient.count(), 42)
117120
}
118121
}
122+
}
119123

120124
func testAccessingTestDependencyFromLiveContext_WhenUpdatingDependencies() {
121125
@Dependency(\.reuseClient) var reuseClient: ReuseClient
@@ -142,6 +146,7 @@ final class DependencyValuesTests: XCTestCase {
142146
}
143147

144148
func testBinding() {
149+
DependencyValues.withValue(\.context, .test) {
145150
@Dependency(\.childDependencyEarlyBinding) var childDependencyEarlyBinding:
146151
ChildDependencyEarlyBinding
147152
@Dependency(\.childDependencyLateBinding) var childDependencyLateBinding:
@@ -179,6 +184,7 @@ final class DependencyValuesTests: XCTestCase {
179184
XCTAssertEqual(childDependencyLateBindingEscaped.fetch(), 1_000)
180185
}
181186
}
187+
}
182188

183189
func testNestedDependencyIsOverridden() {
184190
DependencyValues.withValue(\.nestedValue.value, 10) {

0 commit comments

Comments
 (0)