diff --git a/resources/assets/src/components/user/ClosetItem.vue b/resources/assets/src/components/user/ClosetItem.vue index d5f542ac..6827cf44 100644 --- a/resources/assets/src/components/user/ClosetItem.vue +++ b/resources/assets/src/components/user/ClosetItem.vue @@ -8,18 +8,18 @@ {{ textureName }} ({{ type }})

- - @@ -74,9 +74,7 @@ export default { input: 'text', inputValue: this.textureName, showCancelButton: true, - inputValidator: value => (new Promise(resolve => { - value ? resolve() : resolve(this.$t('skinlib.emptyNewTextureName')); - })) + inputValidator: value => !value && this.$t('skinlib.emptyNewTextureName') }); if (dismiss) { return; diff --git a/resources/assets/tests/components/user/ClosetItem.test.js b/resources/assets/tests/components/user/ClosetItem.test.js index 4d86fc53..6ecee627 100644 --- a/resources/assets/tests/components/user/ClosetItem.test.js +++ b/resources/assets/tests/components/user/ClosetItem.test.js @@ -40,10 +40,10 @@ test('rename texture', async () => { axios.post .mockResolvedValueOnce({ data: { errno: 0 } }) .mockResolvedValueOnce({ data: { errno: 1 } }); - swal.mockImplementationOnce(() => Promise.resolve({ dismiss: 'cancel' })) - .mockImplementation(async options => { + swal.mockImplementationOnce(() => ({ dismiss: 'cancel' })) + .mockImplementation(options => { options.inputValidator('name'); - options.inputValidator().catch(() => {}); + options.inputValidator(); return { value: 'new-name' }; });