From 896d656c3bc1667e5fe47970dd065b4312f0a32e Mon Sep 17 00:00:00 2001 From: Krunoslav Zaher Date: Sun, 13 Mar 2016 12:50:02 +0100 Subject: [PATCH] Fixes automation tests. --- .../APIWrappers/APIWrappersViewController.swift | 17 ++++++++--------- scripts/automation-tests/04_controlsTests.js | 4 +--- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/RxExample/RxExample/Examples/APIWrappers/APIWrappersViewController.swift b/RxExample/RxExample/Examples/APIWrappers/APIWrappersViewController.swift index 475f42f0..f9e9c3fc 100644 --- a/RxExample/RxExample/Examples/APIWrappers/APIWrappersViewController.swift +++ b/RxExample/RxExample/Examples/APIWrappers/APIWrappersViewController.swift @@ -84,7 +84,7 @@ class APIWrappersViewController: ViewController { // MARK: UISwitch // also test two way binding - let switchValue = Variable(false) + let switchValue = Variable(true) switcher.rx_value <-> switchValue switchValue.asObservable() @@ -112,7 +112,7 @@ class APIWrappersViewController: ViewController { // MARK: UISlider // also test two way binding - let sliderValue = Variable(0.0) + let sliderValue = Variable(1.0) slider.rx_value <-> sliderValue sliderValue.asObservable() @@ -125,7 +125,7 @@ class APIWrappersViewController: ViewController { // MARK: UIDatePicker // also test two way binding - let dateValue = Variable(NSDate()) + let dateValue = Variable(NSDate(timeIntervalSince1970: 0)) datePicker.rx_date <-> dateValue @@ -166,7 +166,7 @@ class APIWrappersViewController: ViewController { textViewValue.asObservable() .subscribeNext { [weak self] x in - self?.debug("UITextView event \(x)") + self?.debug("UITextView text \(x)") } .addDisposableTo(disposeBag) @@ -177,17 +177,16 @@ class APIWrappersViewController: ViewController { #endif manager.rx_didUpdateLocations - .subscribeNext { [weak self] x in - self?.debug("rx_didUpdateLocations \(x)") + .subscribeNext { x in + print("rx_didUpdateLocations \(x)") } .addDisposableTo(disposeBag) _ = manager.rx_didFailWithError - .subscribeNext { [weak self] x in - self?.debug("rx_didFailWithError \(x)") + .subscribeNext { x in + print("rx_didFailWithError \(x)") } - manager.rx_didChangeAuthorizationStatus .subscribeNext { status in print("Authorization status \(status)") diff --git a/scripts/automation-tests/04_controlsTests.js b/scripts/automation-tests/04_controlsTests.js index f4eb34f5..639b03fb 100644 --- a/scripts/automation-tests/04_controlsTests.js +++ b/scripts/automation-tests/04_controlsTests.js @@ -137,7 +137,7 @@ test("----- UITextView text -----", function (check, pass) { check(function () { var textValue = scrollView.staticTexts()["debugLabel"].value(); - return textValue === "UITextField text t"; + return textValue === "UITextView text t"; }); goBack(); @@ -158,5 +158,3 @@ test("----- UISlider value -----", function (check, pass) { goBack(); }); - -