Add onComplete

compulim · Jul 2, 2019 · bfcf4a7 · bfcf4a7
1 parent 0920cf4
commit bfcf4a7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/packages/core/src/__tests__/observeOnce.spec.js b/packages/core/src/__tests__/observeOnce.spec.js
@@ -6,6 +6,7 @@ import observeOnce from '../sagas/effects/observeOnce';
 describe('observeOnce', () => {
   let inputOutput;
   let observable;
+  let onComplete;
   let onError;
   let onNext;
   let unsubscribe;
@@ -16,6 +17,7 @@ describe('observeOnce', () => {
       subscribe: jest.fn((...args) => {
         onNext = args[0];
         onError = args[1];
+        onComplete = args[2];
 
         return {
           unsubscribe
@@ -62,6 +64,23 @@ describe('observeOnce', () => {
             expect(unsubscribe).toHaveBeenCalledTimes(1);
           }
 
+          resolve();
+        } catch (err) {
+          reject(err);
+        }
+      });
+    }));
+
+  test('should unsubscribe after complete', () =>
+    new Promise((resolve, reject) => {
+      runSaga(inputOutput, function*() {
+        try {
+          const [result] = yield all([observeOnce(observable), call(() => onComplete())]);
+
+          expect(observable.subscribe).toHaveBeenCalledTimes(1);
+          expect(result).toBeUndefined();
+          expect(unsubscribe).toHaveBeenCalledTimes(1);
+
           resolve();
         } catch (err) {
           reject(err);

diff --git a/packages/core/src/sagas/effects/observeOnce.js b/packages/core/src/sagas/effects/observeOnce.js
@@ -8,7 +8,7 @@ export default function observeOnceEffect(observable) {
       return yield call(
         () =>
           new Promise((resolve, reject) => {
-            subscription = observable.subscribe(resolve, reject);
+            subscription = observable.subscribe(resolve, reject, resolve);
           })
       );
     } finally {