From c7a641fe212ae8d9694e31eaeefe982f5fc8f5f1 Mon Sep 17 00:00:00 2001 From: mrahmiao Date: Fri, 1 Jan 2016 22:28:42 +0800 Subject: [PATCH] Fixes test failures of `rx_state` of `NSButton` and `rx_enabled` of `NSControl`. Signed-off-by: mrahmiao --- Tests/RxCocoaTests/Control+RxTests+Cocoa.swift | 4 ++-- Tests/RxCocoaTests/NSControl+RxTests.swift | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Tests/RxCocoaTests/Control+RxTests+Cocoa.swift b/Tests/RxCocoaTests/Control+RxTests+Cocoa.swift index 90555276..72e7815c 100644 --- a/Tests/RxCocoaTests/Control+RxTests+Cocoa.swift +++ b/Tests/RxCocoaTests/Control+RxTests+Cocoa.swift @@ -43,7 +43,7 @@ extension ControlTests { } func testButton_StateCompletesOnDealloc() { - let createView: () -> NSButton = { NSButton(frame: CGRectMake(0, 0, 1, 1)) } - ensureEventDeallocated(createView) { (view: NSButton) in view.rx_state } + let createView: () -> NSButton = { NSButton(frame: CGRectMake(0, 0, 1, 1)) } + ensurePropertyDeallocated(createView, 0) { (view: NSButton) in view.rx_state } } } \ No newline at end of file diff --git a/Tests/RxCocoaTests/NSControl+RxTests.swift b/Tests/RxCocoaTests/NSControl+RxTests.swift index 99cead07..d2ace6e6 100644 --- a/Tests/RxCocoaTests/NSControl+RxTests.swift +++ b/Tests/RxCocoaTests/NSControl+RxTests.swift @@ -18,15 +18,15 @@ class NSControlTests : RxTest { extension NSControlTests { func testEnabled_False() { let subject = NSButton(frame: CGRectMake(0, 0, 1, 1)) - just(false).subscribe(subject.rx_enabled).dispose() + Observable.just(false).subscribe(subject.rx_enabled).dispose() XCTAssertTrue(subject.enabled == false) } func testEnabled_True() { let subject = NSButton(frame: CGRectMake(0, 0, 1, 1)) - just(true).subscribe(subject.rx_enabled).dispose() + Observable.just(true).subscribe(subject.rx_enabled).dispose() - XCTAssertFalse(subject.enabled == true) + XCTAssertTrue(subject.enabled == true) } } \ No newline at end of file