Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Return Single trait for toArray() method #1923

Merged
merged 3 commits into from
Apr 10, 2019
Merged

Return Single trait for toArray() method #1923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15cb271
Return Single trait for toArray() method
Apr 9, 2019
6d90bf3
Update RxSwift/Observables/ToArray.swift
freak4pc Apr 9, 2019
875311c
Update RxSwift/Observables/ToArray.swift
freak4pc Apr 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions RxSwift/Observables/ToArray.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
extension ObservableType {

/**
Converts an Observable into another Observable that emits the whole sequence as a single array and then terminates.
Converts an Observable into a Single that emits the whole sequence as a single array and then terminates.

For aggregation behavior see `reduce`.

- seealso: [toArray operator on reactivex.io](http://reactivex.io/documentation/operators/to.html)

- returns: An observable sequence containing all the emitted elements as array.
- returns: A Single sequence containing all the emitted elements as array.
*/
public func toArray()
-> Observable<[E]> {
return ToArray(source: self.asObservable())
-> Single<[E]> {
return PrimitiveSequence(raw: ToArray(source: self.asObservable()))
}
}

Expand Down
12 changes: 6 additions & 6 deletions Tests/RxSwiftTests/Observable+ToArrayTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ extension ObservableToArrayTest {
])

let res = scheduler.start {
return xs.toArray().map { EquatableArray($0) }
return xs.toArray().map { EquatableArray($0) }.asObservable()
}

let correctMessages = Recorded.events(
Expand Down Expand Up @@ -53,7 +53,7 @@ extension ObservableToArrayTest {
])

let res = scheduler.start {
return xs.toArray().map { EquatableArray($0) }
return xs.toArray().map { EquatableArray($0) }.asObservable()
}

let correctMessages = Recorded.events(
Expand All @@ -77,7 +77,7 @@ extension ObservableToArrayTest {
])

let res = scheduler.start {
return xs.toArray().map { EquatableArray($0) }
return xs.toArray().map { EquatableArray($0) }.asObservable()
}

let correctMessages = Recorded.events(
Expand All @@ -101,7 +101,7 @@ extension ObservableToArrayTest {
])

let res = scheduler.start {
return xs.toArray().map { EquatableArray($0) }
return xs.toArray().map { EquatableArray($0) }.asObservable()
}

let correctMessages: [Recorded<Event<EquatableArray<Int>>>] = [
Expand All @@ -123,7 +123,7 @@ extension ObservableToArrayTest {
])

let res = scheduler.start {
return xs.toArray().map { EquatableArray($0) }
return xs.toArray().map { EquatableArray($0) }.asObservable()
}

let correctMessages = [
Expand All @@ -150,7 +150,7 @@ extension ObservableToArrayTest {
])

let res = scheduler.start {
return xs.toArray().map { EquatableArray($0) }
return xs.toArray().map { EquatableArray($0) }.asObservable()
}

let correctMessages = [
Expand Down