From 505f5b713f6016b715935d9e11ef64ff6cbf4fbe Mon Sep 17 00:00:00 2001
From: OJ Kwon <kwon.ohjoong@gmail.com>
Date: Wed, 18 Nov 2015 17:33:16 -0800
Subject: [PATCH] fix(test): make explicit unsubscription for observable

---
 spec/observables/fromEvent-spec.js | 14 ++++++++------
 spec/operators/bufferWhen-spec.js  | 12 ++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/spec/observables/fromEvent-spec.js b/spec/observables/fromEvent-spec.js
index 6e54d4ee3c..d3f8ad987b 100644
--- a/spec/observables/fromEvent-spec.js
+++ b/spec/observables/fromEvent-spec.js
@@ -94,11 +94,12 @@ describe('Observable.fromEvent', function () {
       }
     };
 
-    var subscription = Observable.fromEvent(obj, 'click')
+    Observable.fromEvent(obj, 'click').take(1)
       .subscribe(function (e) {
         expect(e).toBe('test');
-        done();
-      });
+      }, function (err) {
+        done.fail('should not be called');
+      }, done);
 
     send('test');
   });
@@ -117,11 +118,12 @@ describe('Observable.fromEvent', function () {
       return x + '!';
     }
 
-    var subscription = Observable.fromEvent(obj, 'click', selector)
+    Observable.fromEvent(obj, 'click', selector).take(1)
       .subscribe(function (e) {
         expect(e).toBe('test!');
-        done();
-      });
+      }, function (err) {
+        done.fail('should not be called');
+      }, done);
 
     send('test');
   });
diff --git a/spec/operators/bufferWhen-spec.js b/spec/operators/bufferWhen-spec.js
index 0dc5dd22b7..486fa1e08b 100644
--- a/spec/operators/bufferWhen-spec.js
+++ b/spec/operators/bufferWhen-spec.js
@@ -230,17 +230,17 @@ describe('Observable.prototype.bufferWhen', function () {
     var closing = Observable.empty();
     var TOO_MANY_INVOCATIONS = 30;
 
-    var invoked = 0;
     source
       .bufferWhen(function () { return closing; })
+      .takeWhile(function (val, index) {
+        return index < TOO_MANY_INVOCATIONS;
+      })
       .subscribe(function (val) {
         expect(Array.isArray(val)).toBe(true);
         expect(val.length).toBe(0);
-        invoked++;
-        if (invoked > TOO_MANY_INVOCATIONS) {
-          done();
-        }
-      }, null, null);
+      }, function (err) {
+        done.fail('should not be called');
+      }, done);
   });
 
   it('should handle inner throw', function () {