From a2e6315198515404ce77197c6cf8e132a1b6e14d Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Sun, 5 Aug 2018 14:36:44 +0800
Subject: [PATCH] Simplify input validator

---
 .../assets/src/components/user/ClosetItem.vue | 24 +++++++++----------
 .../tests/components/user/ClosetItem.test.js  |  6 ++---
 2 files changed, 14 insertions(+), 16 deletions(-)

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 @@
                 <span :title="name">{{ textureName }} <small>({{ type }})</small></span>
             </p>
 
-            <a 
-                :href="linkToSkinlib" 
-                :title="$t('user.viewInSkinlib')" 
-                class="more" 
-                data-toggle="tooltip" 
+            <a
+                :href="linkToSkinlib"
+                :title="$t('user.viewInSkinlib')"
+                class="more"
+                data-toggle="tooltip"
                 data-placement="bottom"
             ><i class="fa fa-share"></i></a>
-            <span 
-                :title="$t('general.more')" 
-                class="more" 
-                data-toggle="dropdown" 
-                aria-haspopup="true" 
+            <span
+                :title="$t('general.more')"
+                class="more"
+                data-toggle="dropdown"
+                aria-haspopup="true"
                 id="more-button"
             ><i class="fa fa-cog"></i></span>
 
@@ -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' };
         });