Merge pull request #377 from vatosarmat/master

jfairbank · Nov 2, 2021 · 8cd347a · 8cd347a
2 parents dea9c86 + de90d6b
commit 8cd347a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/__tests__/expectSaga/expectSaga.test.js b/__tests__/expectSaga/expectSaga.test.js
@@ -9,6 +9,7 @@ import {
   take,
   takeEvery,
 } from 'redux-saga/effects';
+import { END } from 'redux-saga';
 import { warn } from 'utils/logging';
 import { delay } from 'utils/async';
 import expectSaga from 'expectSaga';
@@ -304,3 +305,22 @@ test('terminates and does not wait for Call effect Promises', async () => {
 
   expect(warn).not.toHaveBeenCalled();
 });
+
+test('terminates on END action', async () => {
+  warn.mockClear();
+
+  function* infiniteLoop() {
+    while (true) {
+      // Redux-saga docs:
+      // If you dispatch the END action, then all Sagas blocked on a take Effect
+      // will be terminated regardless of the specified pattern
+      yield take('HELLO_WORLD');
+    }
+  }
+
+  await expectSaga(infiniteLoop)
+    .dispatch(END)
+    .run();
+
+  expect(warn).not.toHaveBeenCalled();
+});
diff --git a/src/expectSaga/findDispatchableActionIndex.js b/src/expectSaga/findDispatchableActionIndex.js
@@ -1,4 +1,5 @@
 // @flow
+import { END } from 'redux-saga';
 import { findIndex } from '../utils/array';
 
 export default function findDispatchableActionIndex(
@@ -35,7 +36,7 @@ export default function findDispatchableActionIndex(
     return -1;
   }
 
-  return findIndex(actions, a => a.type === pattern);
+  return findIndex(actions, a => a.type === pattern || a.type === END.type);
 }
 
 function hasOwn(object: Object, key: string): boolean {