Skip to content

Commit c5cc06f

Browse files
adrianomelobenlesh
authored andcommitted
fix(take): deal with total <= 0 and add tests
1 parent bba988e commit c5cc06f

File tree

2 files changed

+80
-1
lines changed

2 files changed

+80
-1
lines changed

spec/operators/take-spec.js

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
/* globals describe, it, expect, expectObservable, hot */
2+
var Rx = require('../../dist/cjs/Rx');
3+
var Observable = Rx.Observable;
4+
5+
describe('Observable.prototype.take()', function () {
6+
it('should work with empty', function () {
7+
var e1 = Observable.empty();
8+
var expected = '|';
9+
expectObservable(e1.take(42)).toBe(expected);
10+
});
11+
12+
it('should go on forever on never', function () {
13+
var e1 = Observable.never();
14+
var expected = '-';
15+
expectObservable(e1.take(42)).toBe(expected);
16+
});
17+
18+
it('should be empty on take(0)', function () {
19+
var e1 = hot('--a--^--b----c---d--|');
20+
var expected = '|';
21+
expectObservable(e1.take(0)).toBe(expected);
22+
});
23+
24+
it('should take one value of an observable with one value', function () {
25+
var e1 = hot('---(a|)');
26+
var expected = '---(a|)';
27+
expectObservable(e1.take(1)).toBe(expected);
28+
});
29+
30+
it('should take one values of an observable with many values', function () {
31+
var e1 = hot('--a--^--b----c---d--|');
32+
var expected = '---(b|)';
33+
expectObservable(e1.take(1)).toBe(expected);
34+
});
35+
36+
it('should take two values of an observable with many values', function () {
37+
var e1 = hot('--a--^--b----c---d--|');
38+
var expected = '---b----(c|)';
39+
expectObservable(e1.take(2)).toBe(expected);
40+
});
41+
42+
it('should error on empty', function () {
43+
var e1 = hot('--a--^----|');
44+
var expected = '-----|';
45+
expectObservable(e1.take(42)).toBe(expected);
46+
});
47+
48+
it('should propagate error from the source observable', function () {
49+
var e1 = hot('---^---#', null, 'too bad');
50+
var expected = '----#';
51+
expectObservable(e1.take(42)).toBe(expected, null, 'too bad');
52+
});
53+
54+
it('should propagate error from an observable with values', function () {
55+
var e1 = hot('---^--a--b--#');
56+
var expected = '---a--b--#';
57+
expectObservable(e1.take(42)).toBe(expected);
58+
});
59+
60+
it('should work with throw', function () {
61+
var e1 = Observable.throw(new Error('too bad'));
62+
var expected = '#';
63+
expectObservable(e1.take(42)).toBe(expected, null, new Error('too bad'));
64+
});
65+
66+
it('should throw if total is less than zero', function () {
67+
expect(function () { Observable.range(0,10).take(-1); })
68+
.toThrow(new Rx.ArgumentOutOfRangeError());
69+
});
70+
});

src/operators/take.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
11
import Operator from '../Operator';
22
import Subscriber from '../Subscriber';
3+
import ArgumentOutOfRangeError from '../util/ArgumentOutOfRangeError';
4+
import EmptyObservable from '../observables/EmptyObservable';
35

46
export default function take(total) {
5-
return this.lift(new TakeOperator(total));
7+
if (total === 0) {
8+
return new EmptyObservable();
9+
} else {
10+
return this.lift(new TakeOperator(total));
11+
}
612
}
713

814
class TakeOperator<T, R> implements Operator<T, R> {
915
constructor(private total: number) {
16+
if (this.total < 0) {
17+
throw new ArgumentOutOfRangeError;
18+
}
1019
}
1120

1221
call(subscriber: Subscriber<T>): Subscriber<T> {

0 commit comments

Comments
 (0)