Conflict resolving

Changelog.md

@@ -4,10 +4,12 @@ Changelog
 
 Current master
 --------------
+- Add `completions` property to `CompletableAction`
+
 3.11.0
 -------
-- Introduction of  `underlyingError` observable which returns a `Swift.Error`  element type. 
-- Updated specs that were breaking in `Circle CI` pipeline 
+- Introduction of  `underlyingError` observable which returns a `Swift.Error`  element type.
+- Updated specs that were breaking in `Circle CI` pipeline
 
 3.10.2
 -------

Sources/Action/Action+Extensions.swift

@@ -21,3 +21,14 @@ public extension Action where Input == Void {
         return execute(())
     }
 }
+
+public extension CompletableAction {
+    /// Emits everytime work factory completes.
+    var completions: Observable<Void> {
+        return executionObservables
+            .flatMap { execution in
+                execution.flatMap { _ in Observable.empty() }
+                    .concat(Observable.just(()))
+        }
+    }
+}

Tests/ActionTests/ActionTests.swift

@@ -18,8 +18,8 @@ class ActionTests: QuickSpec {
         describe("completable action") {
             var action: CompletableAction<String>!
             beforeEach {
-                let work: Completable = Observable<Never>.empty().asCompletable()
-                action = CompletableAction {_ in work }
+                let work: TestableObservable<Never> = scheduler.createColdObservable([.completed(0)])
+                action = CompletableAction {_ in work.asCompletable() }
                 scheduler.scheduleAt(10) { action.inputs.onNext("a") }
                 scheduler.scheduleAt(20) { action.inputs.onNext("b") }
             }
@@ -41,6 +41,13 @@ class ActionTests: QuickSpec {
                 scheduler.start()
                 XCTAssertEqual(elements.events.count, 0)
             }
+            it("emits on `completions` when completed") {
+                let completions = scheduler.createObserver(Void.self)
+                action.completions.bind(to: completions).disposed(by: disposeBag)
+                scheduler.start()
+                XCTAssert(completions.events.contains { $0.time == 10})
+                XCTAssert(completions.events.contains { $0.time == 20})
+            }
         }
 
 		describe("action properties") {