Merge pull request #23 from ReactiveCocoa/scoped-disposable-fix

[ScopedDisposable] Fix infinite loop in `init(_ disposable: Disposable)`

Author: mdiep

Sources/Disposable.swift

@@ -227,7 +227,7 @@ extension ScopedDisposable where InnerDisposable: AnyDisposable {
 	///   - disposable: A disposable to dispose of when deinitializing, which
 	///                 will be wrapped in an `AnyDisposable`.
 	public convenience init(_ disposable: Disposable) {
-		self.init(AnyDisposable(disposable))
+		self.init(InnerDisposable(disposable))
 	}
 }
 

Tests/ReactiveSwiftTests/DisposableSpec.swift

@@ -84,6 +84,12 @@ class DisposableSpec: QuickSpec {
 		}
 
 		describe("ScopedDisposable") {
+			it("should be initialized with an instance of `Disposable` protocol type") {
+				let d: Disposable = SimpleDisposable()
+				let scoped = ScopedDisposable(d)
+				expect(type(of: scoped) == ScopedDisposable<AnyDisposable>.self) == true
+			}
+
 			it("should dispose of the inner disposable upon deinitialization") {
 				let simpleDisposable = SimpleDisposable()