Commit 0bb1009c authored by Lukas Eipert's avatar Lukas Eipert

allow for testAction to wait until all promises are resolved

parent 66f5be83
...@@ -84,14 +84,12 @@ export default ( ...@@ -84,14 +84,12 @@ export default (
done(); done();
}; };
return new Promise((resolve, reject) => {
try {
const result = action({ commit, state, dispatch, rootState: state }, payload); const result = action({ commit, state, dispatch, rootState: state }, payload);
resolve(result);
} catch (e) { return new Promise(resolve => {
reject(e); setImmediate(resolve);
}
}) })
.then(() => result)
.catch(error => { .catch(error => {
validateResults(); validateResults();
throw error; throw error;
......
...@@ -138,4 +138,29 @@ describe('VueX test helper (testAction)', () => { ...@@ -138,4 +138,29 @@ describe('VueX test helper (testAction)', () => {
}); });
}); });
}); });
it('should work with async actions not returning promises', done => {
const data = { FOO: 'BAR' };
const promiseAction = ({ commit, dispatch }) => {
dispatch('ACTION');
axios
.get(TEST_HOST)
.then(() => {
commit('SUCCESS');
return data;
})
.catch(error => {
commit('ERROR');
throw error;
});
};
mock.onGet(TEST_HOST).replyOnce(200, 42);
assertion = { mutations: [{ type: 'SUCCESS' }], actions: [{ type: 'ACTION' }] };
testAction(promiseAction, null, {}, assertion.mutations, assertion.actions, done);
});
}); });
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment