DisposableBag conforms now to Disposable protocol

yankodimitrov · Jan 29, 2016 · d78dec6 · d78dec6
1 parent 28befa3
commit d78dec6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/SignalKit/Utilities/DisposableBag.swift b/SignalKit/Utilities/DisposableBag.swift
@@ -47,3 +47,11 @@ extension DisposableBag {
         return bag.count
     }
 }
+
+extension DisposableBag: Disposable {
+
+    public func dispose() {
+
+        removeAll()
+    }
+}
diff --git a/SignalKitTests/Utilities/DisposableBagTests.swift b/SignalKitTests/Utilities/DisposableBagTests.swift
@@ -59,4 +59,16 @@ class DisposableBagTests: XCTestCase {
 
         XCTAssertEqual(disposable.isDisposeCalled, true, "Should remove and dispose all disposables on deinit")
     }
+
+    func testDispose() {
+
+        let signalTwo = MockSignal<String>()
+
+        bag.addDisposable(signal)
+        bag.addDisposable(signalTwo)
+
+        bag.dispose()
+
+        XCTAssertEqual(bag.count, 0, "Should remove all signals from the bag")
+    }
 }