From 8cbc17391525cb077694a437474e2942ea46491b Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Wed, 1 May 2019 12:21:59 -0300 Subject: [PATCH] Updating to Rx 5.0 and fixing deprecated warnings. --- Cartfile | 2 +- Cartfile.resolved | 4 +- Tests/ActionTests/ActionTests.swift | 146 ++++++++++++++-------------- Tests/InputSubjectTests.swift | 18 ++-- 4 files changed, 85 insertions(+), 85 deletions(-) diff --git a/Cartfile b/Cartfile index 0fb6d5b8..43e186b7 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "ReactiveX/RxSwift" ~> 4.4.2 +github "ReactiveX/RxSwift" ~> 5.0.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index e4195453..e6766941 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,3 +1,3 @@ github "Quick/Nimble" "v8.0.1" -github "Quick/Quick" "v2.0.0" -github "ReactiveX/RxSwift" "4.4.2" +github "Quick/Quick" "v2.1.0" +github "ReactiveX/RxSwift" "5.0.1" diff --git a/Tests/ActionTests/ActionTests.swift b/Tests/ActionTests/ActionTests.swift index 5d8ce029..282e8485 100644 --- a/Tests/ActionTests/ActionTests.swift +++ b/Tests/ActionTests/ActionTests.swift @@ -31,8 +31,8 @@ class ActionTests: QuickSpec { action.inputs.bind(to: inputs).disposed(by: disposeBag) scheduler.start() XCTAssertEqual(inputs.events, [ - next(10, "a"), - next(20, "b"), + Recorded.next(10, "a"), + Recorded.next(20, "b"), ]) } it("emits nothing on `elements`") { @@ -105,15 +105,15 @@ class ActionTests: QuickSpec { sharedExamples("send elements to elements observable") { it("inputs subject receives generated inputs") { XCTAssertEqual(inputs.events, [ - next(10, "a"), - next(20, "b"), + Recorded.next(10, "a"), + Recorded.next(20, "b"), ]) } it("elements observable receives generated elements") { XCTAssertEqual(elements.events, [ - next(10, "a"), - next(20, "b"), + Recorded.next(10, "a"), + Recorded.next(20, "b"), ]) } @@ -123,21 +123,21 @@ class ActionTests: QuickSpec { it("disabled until element returns") { XCTAssertEqual(enabled.events, [ - next(0, true), - next(10, false), - next(10, true), - next(20, false), - next(20, true), + Recorded.next(0, true), + Recorded.next(10, false), + Recorded.next(10, true), + Recorded.next(20, false), + Recorded.next(20, true), ]) } it("executing until element returns") { XCTAssertEqual(executing.events, [ - next(0, false), - next(10, true), - next(10, false), - next(20, true), - next(20, false), + Recorded.next(0, false), + Recorded.next(10, true), + Recorded.next(10, false), + Recorded.next(20, true), + Recorded.next(20, false), ]) } @@ -178,19 +178,19 @@ class ActionTests: QuickSpec { sharedExamples("send array elements to elements observable") { it("inputs subject receives generated inputs") { XCTAssertEqual(inputs.events, [ - next(10, "a"), - next(20, "b"), + Recorded.next(10, "a"), + Recorded.next(20, "b"), ]) } it("elements observable receives generated elements") { XCTAssertEqual(elements.events, [ - next(10, "a"), - next(10, "b"), - next(10, "c"), - next(20, "b"), - next(20, "c"), - next(20, "d"), + Recorded.next(10, "a"), + Recorded.next(10, "b"), + Recorded.next(10, "c"), + Recorded.next(20, "b"), + Recorded.next(20, "c"), + Recorded.next(20, "d"), ]) } @@ -200,21 +200,21 @@ class ActionTests: QuickSpec { it("disabled until element returns") { XCTAssertEqual(enabled.events, [ - next(0, true), - next(10, false), - next(10, true), - next(20, false), - next(20, true), + Recorded.next(0, true), + Recorded.next(10, false), + Recorded.next(10, true), + Recorded.next(20, false), + Recorded.next(20, true), ]) } it("executing until element returns") { XCTAssertEqual(executing.events, [ - next(0, false), - next(10, true), - next(10, false), - next(20, true), - next(20, false), + Recorded.next(0, false), + Recorded.next(10, true), + Recorded.next(10, false), + Recorded.next(20, true), + Recorded.next(20, false), ]) } @@ -264,8 +264,8 @@ class ActionTests: QuickSpec { sharedExamples("send errors to errors observable") { it("inputs subject receives generated inputs") { XCTAssertEqual(inputs.events, [ - next(10, "a"), - next(20, "b"), + Recorded.next(10, "a"), + Recorded.next(20, "b"), ]) } @@ -275,8 +275,8 @@ class ActionTests: QuickSpec { it("errors observable receives generated errors") { XCTAssertEqual(errors.events, [ - next(10, .underlyingError(TestError)), - next(20, .underlyingError(TestError)), + Recorded.next(10, .underlyingError(TestError)), + Recorded.next(20, .underlyingError(TestError)), ]) } @@ -293,21 +293,21 @@ class ActionTests: QuickSpec { it("disabled until error returns") { XCTAssertEqual(enabled.events, [ - next(0, true), - next(10, false), - next(10, true), - next(20, false), - next(20, true), + Recorded.next(0, true), + Recorded.next(10, false), + Recorded.next(10, true), + Recorded.next(20, false), + Recorded.next(20, true), ]) } it("executing until error returns") { XCTAssertEqual(executing.events, [ - next(0, false), - next(10, true), - next(10, false), - next(20, true), - next(20, false), + Recorded.next(0, false), + Recorded.next(10, true), + Recorded.next(10, false), + Recorded.next(20, true), + Recorded.next(20, false), ]) } @@ -348,8 +348,8 @@ class ActionTests: QuickSpec { sharedExamples("send notEnabled errors to errors observable") { it("inputs subject receives generated inputs") { XCTAssertEqual(inputs.events, [ - next(10, "a"), - next(20, "b"), + Recorded.next(10, "a"), + Recorded.next(20, "b"), ]) } @@ -359,8 +359,8 @@ class ActionTests: QuickSpec { it("errors observable receives generated errors") { XCTAssertEqual(errors.events, [ - next(10, .notEnabled), - next(20, .notEnabled), + Recorded.next(10, .notEnabled), + Recorded.next(20, .notEnabled), ]) } @@ -370,13 +370,13 @@ class ActionTests: QuickSpec { it("disabled") { XCTAssertEqual(enabled.events, [ - next(0, false), + Recorded.next(0, false), ]) } it("never be executing") { XCTAssertEqual(executing.events, [ - next(0, false), + Recorded.next(0, false), ]) } @@ -452,10 +452,10 @@ class ActionTests: QuickSpec { it("element receives single value for each execution") { XCTAssertEqual(element.events, [ - next(10, "a"), - completed(10), - next(20, "b"), - completed(20), + Recorded.next(10, "a"), + Recorded.completed(10), + Recorded.next(20, "b"), + Recorded.completed(20), ]) } @@ -472,14 +472,14 @@ class ActionTests: QuickSpec { it("element receives 3 values for each execution") { XCTAssertEqual(element.events, [ - next(10, "a"), - next(10, "a"), - next(10, "a"), - completed(10), - next(20, "b"), - next(20, "b"), - next(20, "b"), - completed(20), + Recorded.next(10, "a"), + Recorded.next(10, "a"), + Recorded.next(10, "a"), + Recorded.completed(10), + Recorded.next(20, "b"), + Recorded.next(20, "b"), + Recorded.next(20, "b"), + Recorded.completed(20), ]) } @@ -496,8 +496,8 @@ class ActionTests: QuickSpec { it("element fails with underlyingError") { XCTAssertEqual(element.events, [ - error(10, ActionError.underlyingError(TestError)), - error(20, ActionError.underlyingError(TestError)), + Recorded.error(10, ActionError.underlyingError(TestError)), + Recorded.error(20, ActionError.underlyingError(TestError)), ]) } @@ -514,8 +514,8 @@ class ActionTests: QuickSpec { it("element fails with notEnabled") { XCTAssertEqual(element.events, [ - error(10, ActionError.notEnabled), - error(20, ActionError.notEnabled), + Recorded.error(10, ActionError.notEnabled), + Recorded.error(20, ActionError.notEnabled), ]) } @@ -562,14 +562,14 @@ class ActionTests: QuickSpec { it("first element receives single value") { XCTAssertEqual(element.events, [ - next(30, "a"), - completed(30), + Recorded.next(30, "a"), + Recorded.completed(30), ]) } it("second element fails with notEnabled error") { XCTAssertEqual(secondElement.events, [ - error(20, ActionError.notEnabled) + Recorded.error(20, ActionError.notEnabled) ]) } diff --git a/Tests/InputSubjectTests.swift b/Tests/InputSubjectTests.swift index 69cd1b11..1649daba 100644 --- a/Tests/InputSubjectTests.swift +++ b/Tests/InputSubjectTests.swift @@ -50,9 +50,9 @@ class InputSubjectTests: QuickSpec { scheduler.start() XCTAssertEqual(observer.events, [ - next(10, 1), - next(20, 2), - next(30, 3) + Recorded.next(10, 1), + Recorded.next(20, 2), + Recorded.next(30, 3) ]) } @@ -68,8 +68,8 @@ class InputSubjectTests: QuickSpec { scheduler.start() XCTAssertEqual(observer.events, [ - next(10, 1), - next(30, 3) + Recorded.next(10, 1), + Recorded.next(30, 3) ]) } @@ -85,8 +85,8 @@ class InputSubjectTests: QuickSpec { scheduler.start() XCTAssertEqual(observer.events, [ - next(10, 1), - next(30, 3) + Recorded.next(10, 1), + Recorded.next(30, 3) ]) } @@ -103,8 +103,8 @@ class InputSubjectTests: QuickSpec { scheduler.start() XCTAssertEqual(observer.events, [ - next(10, 1), - next(20, 2), + Recorded.next(10, 1), + Recorded.next(20, 2), ]) } }