mirror/blessing-skin-server
2
0
Fork 1
mirror of https://github.com/bs-community/blessing-skin-server.git synced 2024-12-21 06:19:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplify input validator

Browse Source
This commit is contained in:
Pig Fang 2018-08-05 14:36:44 +08:00
parent 33de864504
commit a2e6315198
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/assets/src/components/user/ClosetItem.vue
View File

@ -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;

6
resources/assets/tests/components/user/ClosetItem.test.js
View File

@ -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' };
});