Fixed issue with CurrentValueRelay and PassthroughRelay subscription (C…

…ombineCommunity#54)
fabianmuecke · Sep 7, 2020 · efa607b · efa607b
1 parent 7f49594
commit efa607b
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 0 deletions.
diff --git a/Sources/Relays/CurrentValueRelay.swift b/Sources/Relays/CurrentValueRelay.swift
@@ -46,6 +46,10 @@ public class CurrentValueRelay<Output>: Relay {
         publisher.subscribe(storage)
     }
 
+    public func subscribe<P: Relay>(_ publisher: P) -> AnyCancellable where Output == P.Output {
+        publisher.subscribe(storage)
+    }
+
     deinit {
         // Send a finished event upon dealloation
         subscriptions.forEach { $0.forceFinish() }

diff --git a/Sources/Relays/PassthroughRelay.swift b/Sources/Relays/PassthroughRelay.swift
@@ -45,6 +45,10 @@ public class PassthroughRelay<Output>: Relay {
         publisher.subscribe(storage)
     }
 
+    public func subscribe<P: Relay>(_ publisher: P) -> AnyCancellable where Output == P.Output {
+        publisher.subscribe(storage)
+    }
+
     deinit {
         // Send a finished event upon dealloation
         subscriptions.forEach { $0.forceFinish() }

diff --git a/Tests/CurrentValueRelayTests.swift b/Tests/CurrentValueRelayTests.swift
@@ -76,5 +76,27 @@ class CurrentValueRelayTests: XCTestCase {
         XCTAssertFalse(completed)
         XCTAssertEqual(values, ["initial", "1", "2", "3"])
     }
+
+    func testSubscribePublisher2() {
+        var completed = false
+
+        let input = CurrentValueRelay<String>("initial")
+        let output = CurrentValueRelay<String>("initial")
+
+        input
+            .subscribe(output)
+            .store(in: &subscriptions)
+        output
+            .sink(receiveCompletion: { _ in completed = true },
+                  receiveValue: { self.values.append($0) })
+            .store(in: &subscriptions)
+
+        input.accept("1")
+        input.accept("2")
+        input.accept("3")
+
+        XCTAssertFalse(completed)
+        XCTAssertEqual(values, ["initial", "1", "2", "3"])
+    }
 }
 #endif
diff --git a/Tests/PassthroughRelayTests.swift b/Tests/PassthroughRelayTests.swift
@@ -91,5 +91,27 @@ class PassthroughRelayTests: XCTestCase {
         XCTAssertFalse(completed)
         XCTAssertEqual(values, ["1", "2", "3"])
     }
+
+    func testSubscribePublisher2() {
+        var completed = false
+
+        let input = PassthroughRelay<String>()
+        let output = PassthroughRelay<String>()
+
+        input
+            .subscribe(output)
+            .store(in: &subscriptions)
+        output
+            .sink(receiveCompletion: { _ in completed = true },
+                  receiveValue: { self.values.append($0) })
+            .store(in: &subscriptions)
+
+        input.accept("1")
+        input.accept("2")
+        input.accept("3")
+
+        XCTAssertFalse(completed)
+        XCTAssertEqual(values, ["1", "2", "3"])
+    }
 }
 #endif