Updated for Xcode 11 beta 4

tcldr · Jul 17, 2019 · 78c8007 · 78c8007
1 parent 820b528
commit 78c8007
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Sources/Entwine/Operators/WithLatestFrom.swift b/Sources/Entwine/Operators/WithLatestFrom.swift
@@ -112,6 +112,7 @@ extension Publishers {
         }
 
         func receive(completion: Subscribers.Completion<Downstream.Failure>) {
+            terminateSubscription()
             _ = queue.enqueue(completion: completion)
         }
 
@@ -124,6 +125,7 @@ extension Publishers {
         func terminateSubscription() {
             otherSink.terminateSubscription()
             upstreamSubscription?.cancel()
+            upstreamSubscription = nil
         }
     }
 
@@ -160,6 +162,7 @@ extension Publishers {
 
         func terminateSubscription() {
             subscription?.cancel()
+            subscription = nil
         }
     }
 }

diff --git a/Tests/EntwineTests/MaterializeTests.swift b/Tests/EntwineTests/MaterializeTests.swift
@@ -44,7 +44,7 @@ final class MaterializeTests: XCTestCase {
 
     func testMaterializesEmpty() {
 
-        let results1 = scheduler.start { Publishers.Empty<Int, Never>().materialize() }
+        let results1 = scheduler.start { Empty<Int, Never>().materialize() }
 
         let expected1: TestSequence<Signal<Int, Never>, Never> = [
             (200, .subscription),
@@ -60,7 +60,7 @@ final class MaterializeTests: XCTestCase {
 
         enum MaterializedError: Error { case error }
 
-        let results1 = scheduler.start { Publishers.Fail<Int, MaterializedError>(error: .error).materialize() }
+        let results1 = scheduler.start { Fail<Int, MaterializedError>(error: .error).materialize() }
 
         let expected1: TestSequence<Signal<Int, MaterializedError>, Never> = [
             (200, .subscription),