Merge pull request #1661 from sjy/saga_take

enhance: saga-effect take should be able to take multi actions;

packages/dva-core/src/getSaga.js

@@ -124,6 +124,16 @@ function createEffects(model) {
     if (typeof type === 'string') {
       assertAction(type, 'sagaEffects.take');
       return sagaEffects.take(prefixType(type, model));
+    } else if (Array.isArray(type)) {
+      return sagaEffects.take(
+        type.map(t => {
+          if (typeof t === 'string') {
+            assertAction(t, 'sagaEffects.take');
+            return prefixType(type, model);
+          }
+          return t;
+        })
+      );
     } else {
       return sagaEffects.take(type);
     }

packages/dva-core/test/effects.test.js

@@ -123,6 +123,44 @@ describe('effects', () => {
     }, 300);
   });
 
+  it('take with array of actions', () => {
+    const app = create();
+    app.model({
+      namespace: 'count',
+      state: null,
+      reducers: {
+        addRequest() {
+          return 1;
+        },
+        addFailure() {
+          return -1;
+        },
+        addSuccess() {
+          return 0;
+        },
+      },
+      effects: {
+        *add(action, { put }) {
+          yield put({ type: 'addRequest' });
+          if (action.amount > 0.5) {
+            yield put({ type: 'addSuccess' });
+          } else {
+            yield put({ type: 'addFailure' });
+          }
+        },
+        *test(action, { put, take }) {
+          yield put({ type: 'add', amount: action.amount });
+          yield take(['addSuccess', 'addFailure']);
+        },
+      },
+    });
+    app.start();
+    app._store.dispatch({ type: 'count/test', amount: 0 });
+    expect(app._store.getState().count).toEqual(-1);
+    app._store.dispatch({ type: 'count/test', amount: 1 });
+    expect(app._store.getState().count).toEqual(0);
+  });
+
   it('dispatch action for other models', () => {
     const app = create();
     app.model({