From d657e88dd8af2c3dea2a939ac3d808d76b408eb3 Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Thu, 16 Aug 2018 16:46:46 +0800 Subject: [PATCH] Fix risky test --- resources/assets/src/components/user/Players.vue | 3 +-- resources/assets/tests/components/user/Players.test.js | 10 ++++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/resources/assets/src/components/user/Players.vue b/resources/assets/src/components/user/Players.vue index 775bdca2..7deb432e 100644 --- a/resources/assets/src/components/user/Players.vue +++ b/resources/assets/src/components/user/Players.vue @@ -346,8 +346,7 @@ export default { inputValue: player.player_name, input: 'text', showCancelButton: true, - inputValidator: /* istanbul ignore next */ value => - !value && this.$t('user.emptyPlayerName') + inputValidator: value => !value && this.$t('user.emptyPlayerName') }); if (dismiss) { return; diff --git a/resources/assets/tests/components/user/Players.test.js b/resources/assets/tests/components/user/Players.test.js index c0b04ea6..45785f75 100644 --- a/resources/assets/tests/components/user/Players.test.js +++ b/resources/assets/tests/components/user/Players.test.js @@ -90,8 +90,14 @@ test('change player name', async () => { Vue.prototype.$http.post .mockResolvedValueOnce({ errno: 1 }) .mockResolvedValue({ errno: 0 }); - swal.mockResolvedValueOnce({ dismiss: 1 }) - .mockResolvedValue({ value: 'new-name' }); + swal.mockImplementationOnce(() => ({ dismiss: 1 })) + .mockImplementation(({ inputValidator }) => { + if (inputValidator) { + inputValidator(); + inputValidator('new-name'); + return { value: 'new-name' }; + } + }); const wrapper = mount(Players); await wrapper.vm.$nextTick(); const button = wrapper.find('.btn-default');