Skip to content

Commit

Permalink
Updating to Rx 5.0 and fixing deprecated warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
@LucianoPAlmeida
LucianoPAlmeida committed May 1, 2019
1 parent dc1c566 commit 8cbc173
Show file tree
Hide file tree
Showing 4 changed files with 85 additions and 85 deletions.
2 changes: 1 addition & 1 deletion Cartfile
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveX/RxSwift" ~> 4.4.2
github "ReactiveX/RxSwift" ~> 5.0.0
4 changes: 2 additions & 2 deletions Cartfile.resolved
View file
Original file line number Diff line number Diff line change
@@ -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"
146 changes: 73 additions & 73 deletions Tests/ActionTests/ActionTests.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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`") {
Expand Down Expand Up @@ -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"),
])
}

Expand All @@ -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),
])
}

Expand Down Expand Up @@ -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"),
])
}

Expand All @@ -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),
])
}

Expand Down Expand Up @@ -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"),
])
}

Expand All @@ -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)),
])
}

Expand All @@ -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),
])
}

Expand Down Expand Up @@ -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"),
])
}

Expand All @@ -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),
])
}

Expand All @@ -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),
])
}

Expand Down Expand Up @@ -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),
])
}

Expand All @@ -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),
])
}

Expand All @@ -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)),
])
}

Expand All @@ -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),
])
}

Expand Down Expand Up @@ -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)
])
}

Expand Down
18 changes: 9 additions & 9 deletions Tests/InputSubjectTests.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
])
}

Expand All @@ -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)
])
}

Expand All @@ -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)
])
}

Expand All @@ -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),
])
}
}
Expand Down

0 comments on commit 8cbc173

Please sign in to comment.