From 7f67b09071ca28960a99e634b2b64d24a1fbc01a Mon Sep 17 00:00:00 2001 From: OJ Kwon Date: Sat, 12 Dec 2015 10:09:12 -0800 Subject: [PATCH] fix(test): make explicit unsubscription for observable --- spec/observables/fromEventPattern-spec.js | 14 +++++++++----- spec/observables/of-spec.js | 5 +++-- spec/observables/range-spec.js | 6 ++++-- spec/subjects/replay-subject-spec.js | 2 ++ 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/spec/observables/fromEventPattern-spec.js b/spec/observables/fromEventPattern-spec.js index f590479183..50d1bcb9bc 100644 --- a/spec/observables/fromEventPattern-spec.js +++ b/spec/observables/fromEventPattern-spec.js @@ -61,11 +61,12 @@ describe('Observable.fromEventPattern', function () { return a + b + '!'; }; - Observable.fromEventPattern(addHandler, removeHandler, selector) + Observable.fromEventPattern(addHandler, removeHandler, selector).take(1) .subscribe(function (x) { expect(x).toBe('testme!'); - done(); - }); + }, function (e) { + done.fail('should not be called'); + }, done); trigger('test', 'me'); }); @@ -89,10 +90,13 @@ describe('Observable.fromEventPattern', function () { }; Observable.fromEventPattern(addHandler, removeHandler, selector) - .subscribe(function () { }, - function (err) { + .subscribe(function (x) { + done.fail('should not be called'); + }, function (err) { expect(err).toBe('bad'); done(); + }, function () { + done.fail('should not be called'); }); trigger('test'); diff --git a/spec/observables/of-spec.js b/spec/observables/of-spec.js index 46fb8e74a8..b10f34218a 100644 --- a/spec/observables/of-spec.js +++ b/spec/observables/of-spec.js @@ -50,8 +50,9 @@ describe('Observable.of', function () { Observable.of(42).subscribe(function (x) { expect(++calls).toBe(1); expect(x).toBe(42); - done(); - }); + }, function (x) { + done.fail('should not be called'); + }, done); }); it('should handle an Observable as the only value', function () { diff --git a/spec/observables/range-spec.js b/spec/observables/range-spec.js index a32248ff5c..6ab38268ec 100644 --- a/spec/observables/range-spec.js +++ b/spec/observables/range-spec.js @@ -12,7 +12,7 @@ describe('Observable.range', function () { expect(results).toEqual([12, 13, 14, 15]); }); - it('should accept a scheduler' , function (done) { + it('should accept a scheduler', function (done) { var expected = [12, 13, 14, 15]; spyOn(asap, 'schedule').and.callThrough(); @@ -24,7 +24,9 @@ describe('Observable.range', function () { expect(asap.schedule).toHaveBeenCalled(); var exp = expected.shift(); expect(x).toBe(exp); - }, done.throw, done); + }, function (x) { + done.fail('should not be called'); + }, done); }); }); diff --git a/spec/subjects/replay-subject-spec.js b/spec/subjects/replay-subject-spec.js index 91556306a0..3a0b80a983 100644 --- a/spec/subjects/replay-subject-spec.js +++ b/spec/subjects/replay-subject-spec.js @@ -167,6 +167,8 @@ describe('ReplaySubject', function () { expect(results1).toEqual([3,4,5,6,7]); expect(results2).toEqual([4,5,6,7,8]); expect(results3).toEqual([9,10,11]); + + subject.complete(); }); });