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.

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

refactor(bufferToggle-spec): update bufferToggle operator tests to use pipeable operators #3645

Merged
merged 1 commit into from May 9, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
129 changes: 69 additions & 60 deletions spec/operators/bufferToggle-spec.ts
@@ -1,13 +1,12 @@
import { expect } from 'chai';
import * as Rx from 'rxjs/Rx';
import { of, concat, timer, EMPTY } from 'rxjs';
import { bufferToggle, mergeMap, mapTo } from 'rxjs/operators';
import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing';

declare function asDiagram(arg: string): Function;

const Observable = Rx.Observable;

/** @test {bufferToggle} */
describe('Observable.prototype.bufferToggle', () => {
describe('bufferToggle operator', () => {
asDiagram('bufferToggle')('should emit buffers using hot openings and hot closings', () => {
const e1 = hot('---a---b---c---d---e---f---g---|');
const e2 = hot('--o------------------o---------|');
Expand All @@ -18,7 +17,7 @@ describe('Observable.prototype.bufferToggle', () => {
y: ['f'],
};

const result = e1.bufferToggle(e2, (x: any) => e3);
const result = e1.pipe(bufferToggle(e2, (x: any) => e3));

expectObservable(result).toBe(expected, values);
});
Expand All @@ -40,10 +39,12 @@ describe('Observable.prototype.bufferToggle', () => {
};
const innerVals = ['x', 'y', 'z'];

expectObservable(e1.bufferToggle(e2, (x: string) => {
expect(x).to.equal(innerVals.shift());
return e3;
})).toBe(expected, values);
expectObservable(e1.pipe(
bufferToggle(e2, (x: string) => {
expect(x).to.equal(innerVals.shift());
return e3;
}))
).toBe(expected, values);
});

it('should emit buffers using constying cold closings', () => {
Expand All @@ -65,7 +66,7 @@ describe('Observable.prototype.bufferToggle', () => {
};

let i = 0;
const result = e1.bufferToggle(e2, () => closings[i++]);
const result = e1.pipe(bufferToggle(e2, () => closings[i++]));

expectObservable(result).toBe(expected, values);
expectSubscriptions(e1.subscriptions).toBe(subs);
Expand Down Expand Up @@ -93,7 +94,7 @@ describe('Observable.prototype.bufferToggle', () => {
};

let i = 0;
const result = e1.bufferToggle(e2, () => closings[i++].obs);
const result = e1.pipe(bufferToggle(e2, () => closings[i++].obs));

expectObservable(result).toBe(expected, values);
expectSubscriptions(e1.subscriptions).toBe(subs);
Expand All @@ -118,7 +119,7 @@ describe('Observable.prototype.bufferToggle', () => {
};

let i = 0;
const result = e1.bufferToggle(e2, () => closings[i++]);
const result = e1.pipe(bufferToggle(e2, () => closings[i++]));

expectObservable(result).toBe(expected, values);
expectSubscriptions(e1.subscriptions).toBe(subs);
Expand All @@ -140,7 +141,7 @@ describe('Observable.prototype.bufferToggle', () => {
};

let i = 0;
const result = e1.bufferToggle(e2, () => closings[i++]);
const result = e1.pipe(bufferToggle(e2, () => closings[i++]));

expectObservable(result, unsub).toBe(expected, values);
expectSubscriptions(e1.subscriptions).toBe(subs);
Expand All @@ -164,10 +165,11 @@ describe('Observable.prototype.bufferToggle', () => {
};

let i = 0;
const result = e1
.mergeMap((x: any) => Observable.of(x))
.bufferToggle(e2, () => closings[i++])
.mergeMap((x: any) => Observable.of(x));
const result = e1.pipe(
mergeMap((x: any) => of(x)),
bufferToggle(e2, () => closings[i++]),
mergeMap((x: any) => of(x))
);

expectObservable(result, unsub).toBe(expected, values);
expectSubscriptions(e1.subscriptions).toBe(subs);
Expand All @@ -185,12 +187,14 @@ describe('Observable.prototype.bufferToggle', () => {
const expected = '--------------# ';

let i = 0;
const result = e1.bufferToggle(e2, () => {
if (i === 1) {
throw 'error';
}
return closings[i++];
});
const result = e1.pipe(
bufferToggle(e2, () => {
if (i === 1) {
throw 'error';
}
return closings[i++];
})
);

expectObservable(result).toBe(expected);
expectSubscriptions(e1.subscriptions).toBe(subs);
Expand All @@ -211,7 +215,7 @@ describe('Observable.prototype.bufferToggle', () => {
const expected = '--------------# ';

let i = 0;
const result = e1.bufferToggle(e2, () => closings[i++]);
const result = e1.pipe(bufferToggle(e2, () => closings[i++]));

expectObservable(result).toBe(expected);
expectSubscriptions(e1.subscriptions).toBe(subs);
Expand All @@ -234,7 +238,7 @@ describe('Observable.prototype.bufferToggle', () => {
};

let i = 0;
const result = e1.bufferToggle(e2, () => closings[i++]);
const result = e1.pipe(bufferToggle(e2, () => closings[i++]));

expectObservable(result).toBe(expected, values);
expectSubscriptions(e1.subscriptions).toBe(subs);
Expand All @@ -257,7 +261,7 @@ describe('Observable.prototype.bufferToggle', () => {
};

let i = 0;
const result = e1.bufferToggle(e2, () => closings[i++]);
const result = e1.pipe(bufferToggle(e2, () => closings[i++]));

expectObservable(result).toBe(expected, values);
expectSubscriptions(e1.subscriptions).toBe(subs);
Expand All @@ -272,7 +276,7 @@ describe('Observable.prototype.bufferToggle', () => {
const expected = '|';
const values = { x: [] };

const result = e1.bufferToggle(e2, () => e3);
const result = e1.pipe(bufferToggle(e2, () => e3));

expectObservable(result).toBe(expected, values);
});
Expand All @@ -284,7 +288,7 @@ describe('Observable.prototype.bufferToggle', () => {
const expected = '#';
const values = { x: [] };

const result = e1.bufferToggle(e2, () => e3);
const result = e1.pipe(bufferToggle(e2, () => e3));

expectObservable(result).toBe(expected, values);
});
Expand All @@ -298,7 +302,7 @@ describe('Observable.prototype.bufferToggle', () => {
const expected = '----x-----x------x-----x---x-----------------';
const values = { x: [] };

const result = e1.bufferToggle(e2, () => e3);
const result = e1.pipe(bufferToggle(e2, () => e3));

expectObservable(result, unsub).toBe(expected, values);
expectSubscriptions(e1.subscriptions).toBe(subs);
Expand All @@ -310,7 +314,7 @@ describe('Observable.prototype.bufferToggle', () => {
const e3 = cold( '--c-|');
const expected = '-----------------------------------|';

const result = e1.bufferToggle(e2, () => e3);
const result = e1.pipe(bufferToggle(e2, () => e3));

expectObservable(result).toBe(expected);
});
Expand All @@ -325,7 +329,7 @@ describe('Observable.prototype.bufferToggle', () => {
y: ['f', 'g', 'h']
};

const result = e1.bufferToggle(e2, () => e3);
const result = e1.pipe(bufferToggle(e2, () => e3));

expectObservable(result).toBe(expected, values);
});
Expand All @@ -338,25 +342,28 @@ describe('Observable.prototype.bufferToggle', () => {
const e3 = cold( '--c-|');
const expected = '#';

const result = e1.bufferToggle(e2, () => e3);
const result = e1.pipe(bufferToggle(e2, () => e3));

expectObservable(result).toBe(expected);
expectSubscriptions(e1.subscriptions).toBe(e1subs);
expectSubscriptions(e2.subscriptions).toBe(e2subs);
});

it('should accept openings resolved promise', (done: MochaDone) => {
const e1 = Observable.concat(
Observable.timer(10).mapTo(1),
Observable.timer(100).mapTo(2),
Observable.timer(150).mapTo(3),
Observable.timer(200).mapTo(4));
const e1 = concat(
timer(10).pipe(mapTo(1)),
timer(100).pipe(mapTo(2)),
timer(150).pipe(mapTo(3)),
timer(200).pipe(mapTo(4))
);

const expected = [[1]];

e1.bufferToggle(new Promise((resolve: any) => { resolve(42); }), () => {
return Observable.timer(50);
}).subscribe((x) => {
e1.pipe(
bufferToggle(new Promise((resolve: any) => { resolve(42); }), () => {
return timer(50);
})
).subscribe((x) => {
expect(x).to.deep.equal(expected.shift());
}, (x) => {
done(new Error('should not be called'));
Expand All @@ -367,17 +374,19 @@ describe('Observable.prototype.bufferToggle', () => {
});

it('should accept openings rejected promise', (done: MochaDone) => {
const e1 = Observable.concat(Observable.of(1),
Observable.timer(10).mapTo(2),
Observable.timer(10).mapTo(3),
Observable.timer(100).mapTo(4)
);
const e1 = concat(of(1),
timer(10).pipe(mapTo(2)),
timer(10).pipe(mapTo(3)),
timer(100).pipe(mapTo(4))
);

const expected = 42;

e1.bufferToggle(new Promise((resolve: any, reject: any) => { reject(expected); }), () => {
return Observable.timer(50);
}).subscribe((x) => {
e1.pipe(
bufferToggle(new Promise((resolve: any, reject: any) => { reject(expected); }), () => {
return timer(50);
})
).subscribe((x) => {
done(new Error('should not be called'));
}, (x) => {
expect(x).to.equal(expected);
Expand All @@ -388,14 +397,14 @@ describe('Observable.prototype.bufferToggle', () => {
});

it('should accept closing selector that returns a resolved promise', (done: MochaDone) => {
const e1 = Observable.concat(Observable.of(1),
Observable.timer(10).mapTo(2),
Observable.timer(10).mapTo(3),
Observable.timer(100).mapTo(4)
);
const e1 = concat(of(1),
timer(10).pipe(mapTo(2)),
timer(10).pipe(mapTo(3)),
timer(100).pipe(mapTo(4))
);
const expected = [[1]];

e1.bufferToggle(Observable.of(10), () => new Promise((resolve: any) => { resolve(42); }))
e1.pipe(bufferToggle(of(10), () => new Promise((resolve: any) => { resolve(42); })))
.subscribe((x) => {
expect(x).to.deep.equal(expected.shift());
}, () => {
Expand All @@ -407,15 +416,15 @@ describe('Observable.prototype.bufferToggle', () => {
});

it('should accept closing selector that returns a rejected promise', (done: MochaDone) => {
const e1 = Observable.concat(Observable.of(1),
Observable.timer(10).mapTo(2),
Observable.timer(10).mapTo(3),
Observable.timer(100).mapTo(4)
const e1 = concat(of(1),
timer(10).pipe(mapTo(2)),
timer(10).pipe(mapTo(3)),
timer(100).pipe(mapTo(4))
);

const expected = 42;

e1.bufferToggle(Observable.of(10), () => new Promise((resolve: any, reject: any) => { reject(expected); }))
e1.pipe(bufferToggle(of(10), () => new Promise((resolve: any, reject: any) => { reject(expected); })))
.subscribe((x) => {
done(new Error('should not be called'));
}, (x) => {
Expand All @@ -432,7 +441,7 @@ describe('Observable.prototype.bufferToggle', () => {
const e2 = cold('--x-----------y--------z---| ');
const expected = '--l-----------m--------n-----------|';

const result = e1.bufferToggle(e2, () => Observable.empty());
const result = e1.pipe(bufferToggle(e2, () => EMPTY));

expectObservable(result).toBe(expected, {l: [], m: [], n: []});
expectSubscriptions(e1.subscriptions).toBe(subs);
Expand Down