From b4ab63907c66e10703f12f50635e7644d548fe2b Mon Sep 17 00:00:00 2001
From: yushijinhun <yushijinhun@gmail.com>
Date: Sat, 18 May 2019 20:40:28 +0800
Subject: [PATCH 1/4] Test cases for #61

---
 .../assets/tests/views/skinlib/Show.test.ts   | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/resources/assets/tests/views/skinlib/Show.test.ts b/resources/assets/tests/views/skinlib/Show.test.ts
index f3eb8387..79bebe2e 100644
--- a/resources/assets/tests/views/skinlib/Show.test.ts
+++ b/resources/assets/tests/views/skinlib/Show.test.ts
@@ -38,7 +38,7 @@ test('button for adding to closet should be disabled if not auth', () => {
   expect(wrapper.find(Button).attributes('disabled')).toBe('disabled')
 })
 
-test('button for adding to closet should be disabled if auth', () => {
+test('button for adding to closet should be enabled if auth', () => {
   Vue.prototype.$http.get.mockResolvedValue({ data: {} })
   Object.assign(window.blessing.extra, { inCloset: true, currentUid: 1 })
   const wrapper = mount(Show, {
@@ -132,6 +132,28 @@ test('operation panel should not be rendered if not auth', () => {
   expect(wrapper.find('.box-warning').exists()).toBeFalse()
 })
 
+test('operation panel should not be rendered if not privileged', () => {
+  Object.assign(window.blessing.extra, { currentUid: 2 })
+  Vue.prototype.$http.get.mockResolvedValue({ data: { uploader: 1 } })
+  const wrapper = mount(Show, {
+    mocks: {
+      $route: ['/skinlib/show/1', '1'],
+    },
+  })
+  expect(wrapper.find('.box-warning').exists()).toBeFalse()
+})
+
+test('operation panel should be rendered if privileged', () => {
+  Object.assign(window.blessing.extra, { currentUid: 1 })
+  Vue.prototype.$http.get.mockResolvedValue({ data: { uploader: 1 } })
+  const wrapper = mount(Show, {
+    mocks: {
+      $route: ['/skinlib/show/1', '1'],
+    },
+  })
+  expect(wrapper.find('.box-warning').exists()).toBeTrue()
+})
+
 test('download texture', async () => {
   Object.assign(window.blessing.extra, { currentUid: 1 })
   Vue.prototype.$http.get.mockResolvedValue({ data: { tid: 1, name: 'abc' } })

From 4012cfc46fb099b6d7af49206b308d83044f6184 Mon Sep 17 00:00:00 2001
From: yushijinhun <yushijinhun@gmail.com>
Date: Sat, 18 May 2019 20:41:59 +0800
Subject: [PATCH 2/4] Fix #61

---
 resources/assets/src/views/skinlib/Show.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/resources/assets/src/views/skinlib/Show.vue b/resources/assets/src/views/skinlib/Show.vue
index d18328cb..d0443fe1 100644
--- a/resources/assets/src/views/skinlib/Show.vue
+++ b/resources/assets/src/views/skinlib/Show.vue
@@ -8,7 +8,7 @@
         :init-position-z="60"
       >
         <template #footer>
-          <el-button v-if="!auth" disabled :title="$t('skinlib.show.anonymous')">
+          <el-button v-if="anonymous" disabled :title="$t('skinlib.show.anonymous')">
             {{ $t('skinlib.addToCloset') }}
           </el-button>
           <template v-else>
@@ -90,7 +90,7 @@
                 <td v-t="'skinlib.show.name'" />
                 <td>
                   {{ name.length > 15 ? `${name.slice(0, 15)}...` : name }}
-                  <small v-if="uploader === currentUid || admin">
+                  <small v-if="hasEditPermission">
                     <a v-t="'skinlib.show.edit'" href="#" @click="changeTextureName" />
                   </small>
                 </td>
@@ -100,7 +100,7 @@
                 <td>
                   <template v-if="type === 'cape'">{{ $t('general.cape') }}</template>
                   <template v-else>{{ type }}</template>
-                  <small v-if="uploader === currentUid || admin">
+                  <small v-if="hasEditPermission">
                     <a v-t="'skinlib.show.edit'" href="#" @click="changeModel" />
                   </small>
                 </td>
@@ -137,7 +137,7 @@
         </div><!-- /.box-body -->
       </div><!-- /.box -->
 
-      <div v-if="auth" class="box box-warning">
+      <div v-if="hasEditPermission" class="box box-warning">
         <div class="box-header with-border">
           <h3 v-t="'admin.operationsTitle'" class="box-title" />
         </div><!-- /.box-header -->
@@ -206,8 +206,11 @@ export default {
     }
   },
   computed: {
-    auth() {
-      return !!this.currentUid
+    anonymous() {
+      return !this.currentUid
+    },
+    hasEditPermission() {
+      return this.uploader === this.currentUid || this.admin
     },
     togglePrivacyText() {
       return this.public ? 'skinlib.setAsPrivate' : 'skinlib.setAsPublic'

From 979290c71cdf22d576bf6530fec01c7729e0c2f5 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Sun, 19 May 2019 10:30:00 +0800
Subject: [PATCH 3/4] Fix test

---
 resources/assets/src/views/skinlib/Show.vue       |  8 +-------
 resources/assets/tests/views/skinlib/Show.test.ts | 11 +++++++----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/resources/assets/src/views/skinlib/Show.vue b/resources/assets/src/views/skinlib/Show.vue
index d0443fe1..469137e7 100644
--- a/resources/assets/src/views/skinlib/Show.vue
+++ b/resources/assets/src/views/skinlib/Show.vue
@@ -225,14 +225,8 @@ export default {
   methods: {
     async fetchData() {
       const { data = {} } = await this.$http.get(`/skinlib/info/${this.tid}`)
-      this.name = data.name
-      this.type = data.type
-      this.likes = data.likes
-      this.hash = data.hash
-      this.uploader = data.uploader
-      this.size = data.size
+      Object.assign(this, data)
       this.uploadAt = data.upload_at
-      this.public = !!data.public
     },
     async addToCloset() {
       this.$once('like-toggled', () => {
diff --git a/resources/assets/tests/views/skinlib/Show.test.ts b/resources/assets/tests/views/skinlib/Show.test.ts
index 79bebe2e..b676718d 100644
--- a/resources/assets/tests/views/skinlib/Show.test.ts
+++ b/resources/assets/tests/views/skinlib/Show.test.ts
@@ -121,18 +121,19 @@ test('render nickname of uploader', () => {
   expect(wrapper.text()).toContain('general.unexistent-user')
 })
 
-test('operation panel should not be rendered if not auth', () => {
+test('operation panel should not be rendered if user is anonymous', async () => {
   Object.assign(window.blessing.extra, { currentUid: 0 })
-  Vue.prototype.$http.get.mockResolvedValue({ data: {} })
+  Vue.prototype.$http.get.mockResolvedValue({ data: { uploader: 1 } })
   const wrapper = mount(Show, {
     mocks: {
       $route: ['/skinlib/show/1', '1'],
     },
   })
+  await wrapper.vm.$nextTick()
   expect(wrapper.find('.box-warning').exists()).toBeFalse()
 })
 
-test('operation panel should not be rendered if not privileged', () => {
+test('operation panel should not be rendered if not privileged', async () => {
   Object.assign(window.blessing.extra, { currentUid: 2 })
   Vue.prototype.$http.get.mockResolvedValue({ data: { uploader: 1 } })
   const wrapper = mount(Show, {
@@ -140,10 +141,11 @@ test('operation panel should not be rendered if not privileged', () => {
       $route: ['/skinlib/show/1', '1'],
     },
   })
+  await wrapper.vm.$nextTick()
   expect(wrapper.find('.box-warning').exists()).toBeFalse()
 })
 
-test('operation panel should be rendered if privileged', () => {
+test('operation panel should be rendered if privileged', async () => {
   Object.assign(window.blessing.extra, { currentUid: 1 })
   Vue.prototype.$http.get.mockResolvedValue({ data: { uploader: 1 } })
   const wrapper = mount(Show, {
@@ -151,6 +153,7 @@ test('operation panel should be rendered if privileged', () => {
       $route: ['/skinlib/show/1', '1'],
     },
   })
+  await wrapper.vm.$nextTick()
   expect(wrapper.find('.box-warning').exists()).toBeTrue()
 })
 

From 9d2ec9a9557b17d89eaf0e95f7512ccea5cb2ff5 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Sun, 19 May 2019 10:32:28 +0800
Subject: [PATCH 4/4] Tweak

---
 resources/assets/src/views/skinlib/Show.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/src/views/skinlib/Show.vue b/resources/assets/src/views/skinlib/Show.vue
index 469137e7..5f83dd7b 100644
--- a/resources/assets/src/views/skinlib/Show.vue
+++ b/resources/assets/src/views/skinlib/Show.vue
@@ -225,7 +225,7 @@ export default {
   methods: {
     async fetchData() {
       const { data = {} } = await this.$http.get(`/skinlib/info/${this.tid}`)
-      Object.assign(this, data)
+      Object.assign(this.$data, data)
       this.uploadAt = data.upload_at
     },
     async addToCloset() {