Skip to content

Commit

Permalink
fix(throttleTime): use time() to generate throttle amount
Browse files Browse the repository at this point in the history
  • Loading branch information
@sod
sod committed Sep 26, 2017
1 parent 15701a3 commit 2b67db9
Showing 1 changed file with 28 additions and 14 deletions.
42 changes: 28 additions & 14 deletions spec/operators/throttleTime-spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,121 +49,134 @@ describe('Observable.prototype.throttleTime', () => {
it('should simply mirror the source if values are not emitted often enough', () => {
const e1 = hot('-a--------b-----c----|');
const subs = '^ !';
const t = time('-----| ');
const expected = '-a--------b-----c----|';

expectObservable(e1.throttleTime(50, rxTestScheduler)).toBe(expected);
expectObservable(e1.throttleTime(t, rxTestScheduler)).toBe(expected);
expectSubscriptions(e1.subscriptions).toBe(subs);
});

it('should handle a busy producer emitting a regular repeating sequence with leading: true, trailing: false', () => {
const e1 = hot('a12345b12345c12345d123|');
const subs = '^ !';
const t = time('-----| ');
const expected = 'a-----b-----c-----d---|';

expectObservable(e1.throttleTime(50, rxTestScheduler, {leading: true, trailing: false})).toBe(expected);
expectObservable(e1.throttleTime(t, rxTestScheduler, {leading: true, trailing: false})).toBe(expected);
expectSubscriptions(e1.subscriptions).toBe(subs);
});

it('should handle a busy producer emitting a regular repeating sequence with leading: true, trailing: true', () => {
const e1 = hot('a1234b1234c1234d12e--|');
const subs = '^ !';
const t = time('-----| ');
const expected = 'a----b----c----d----e|';

expectObservable(e1.throttleTime(50, rxTestScheduler, {leading: true, trailing: true})).toBe(expected);
expectObservable(e1.throttleTime(t, rxTestScheduler, {leading: true, trailing: true})).toBe(expected);
expectSubscriptions(e1.subscriptions).toBe(subs);
});

it('should not drop values if values are far apart with leading: true, trailing: true', () => {
const e1 = hot('ab-----------c|');
const subs = '^ !';
const t = time('-----| ');
const expected = 'a----b-------c|';

expectObservable(e1.throttleTime(50, rxTestScheduler, {leading: true, trailing: true})).toBe(expected);
expectObservable(e1.throttleTime(t, rxTestScheduler, {leading: true, trailing: true})).toBe(expected);
expectSubscriptions(e1.subscriptions).toBe(subs);
});

it('should handle a busy producer emitting a regular repeating sequence with leading: false, trailing: true', () => {
const e1 = hot('12345a1234b1234c12d--|');
const subs = '^ !';
const t = time('-----| ');
const expected = '-----a----b----c----d|';

expectObservable(e1.throttleTime(50, rxTestScheduler, {leading: false, trailing: true})).toBe(expected);
expectObservable(e1.throttleTime(t, rxTestScheduler, {leading: false, trailing: true})).toBe(expected);
expectSubscriptions(e1.subscriptions).toBe(subs);
});

it('should only emit trailing values with leading: false, trailing: true', () => {
const e1 = hot('ab-----------c--d--|');
const subs = '^ !';
const t = time('-----| ');
const expected = '-----b------------d|';

expectObservable(e1.throttleTime(50, rxTestScheduler, {leading: false, trailing: true})).toBe(expected);
expectObservable(e1.throttleTime(t, rxTestScheduler, {leading: false, trailing: true})).toBe(expected);
expectSubscriptions(e1.subscriptions).toBe(subs);
});

it('should complete when source does not emit', () => {
const e1 = hot('-----|');
const subs = '^ !';
const t = time('-----| ');
const expected = '-----|';

expectObservable(e1.throttleTime(50, rxTestScheduler)).toBe(expected);
expectObservable(e1.throttleTime(t, rxTestScheduler)).toBe(expected);
expectSubscriptions(e1.subscriptions).toBe(subs);
});

it('should raise error when source does not emit and raises error', () => {
const e1 = hot('-----#');
const subs = '^ !';
const t = time('| ');
const expected = '-----#';

expectObservable(e1.throttleTime(10, rxTestScheduler)).toBe(expected);
expectObservable(e1.throttleTime(t, rxTestScheduler)).toBe(expected);
expectSubscriptions(e1.subscriptions).toBe(subs);
});

it('should handle an empty source', () => {
const e1 = cold('|');
const subs = '(^!)';
const t = time('---|');
const expected = '|';

expectObservable(e1.throttleTime(30, rxTestScheduler)).toBe(expected);
expectObservable(e1.throttleTime(t, rxTestScheduler)).toBe(expected);
expectSubscriptions(e1.subscriptions).toBe(subs);
});

it('should handle a never source', () => {
const e1 = cold('-');
const subs = '^';
const t = time('---|');
const expected = '-';

expectObservable(e1.throttleTime(30, rxTestScheduler)).toBe(expected);
expectObservable(e1.throttleTime(t, rxTestScheduler)).toBe(expected);
expectSubscriptions(e1.subscriptions).toBe(subs);
});

it('should handle a throw source', () => {
const e1 = cold('#');
const subs = '(^!)';
const t = time('---|');
const expected = '#';

expectObservable(e1.throttleTime(30, rxTestScheduler)).toBe(expected);
expectObservable(e1.throttleTime(t, rxTestScheduler)).toBe(expected);
expectSubscriptions(e1.subscriptions).toBe(subs);
});

it('should throttle and does not complete when source does not completes', () => {
const e1 = hot('-a--(bc)-------d----------------');
const unsub = ' !';
const subs = '^ !';
const t = time('-----| ');
const expected = '-a-------------d----------------';

expectObservable(e1.throttleTime(50, rxTestScheduler), unsub).toBe(expected);
expectObservable(e1.throttleTime(t, rxTestScheduler), unsub).toBe(expected);
expectSubscriptions(e1.subscriptions).toBe(subs);
});

it('should not break unsubscription chains when result is unsubscribed explicitly', () => {
const e1 = hot('-a--(bc)-------d----------------');
const subs = '^ !';
const expected = '-a-------------d----------------';
const t = time('-----| ');
const unsub = ' !';

const result = e1
.mergeMap((x: string) => Observable.of(x))
.throttleTime(50, rxTestScheduler)
.throttleTime(t, rxTestScheduler)
.mergeMap((x: string) => Observable.of(x));

expectObservable(result, unsub).toBe(expected);
Expand All @@ -173,9 +186,10 @@ describe('Observable.prototype.throttleTime', () => {
it('should throttle values until source raises error', () => {
const e1 = hot('-a--(bc)-------d---------------#');
const subs = '^ !';
const t = time('-----| ');
const expected = '-a-------------d---------------#';

expectObservable(e1.throttleTime(50, rxTestScheduler)).toBe(expected);
expectObservable(e1.throttleTime(t, rxTestScheduler)).toBe(expected);
expectSubscriptions(e1.subscriptions).toBe(subs);
});

Expand Down

0 comments on commit 2b67db9

Please sign in to comment.