From fb10962ff9db383eb722c8ffb57bd274231fc629 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Wed, 1 May 2019 20:15:41 +0800
Subject: [PATCH] Expand content policy alert

---
 resources/assets/src/views/skinlib/Upload.vue       | 10 ++--------
 resources/assets/tests/views/skinlib/Upload.test.ts |  9 +++------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/resources/assets/src/views/skinlib/Upload.vue b/resources/assets/src/views/skinlib/Upload.vue
index b9506474..13ce67d9 100644
--- a/resources/assets/src/views/skinlib/Upload.vue
+++ b/resources/assets/src/views/skinlib/Upload.vue
@@ -47,9 +47,8 @@
               </el-button>
             </div>
 
-            <a v-if="contentPolicy" href="#" @click="showContentPolicy">
-              {{ $t('skinlib.showContentPolicy') }}
-            </a>
+            <!-- eslint-disable-next-line vue/no-v-html -->
+            <div v-if="contentPolicy" class="callout callout-warning" v-html="contentPolicy" />
           </div>
 
           <div class="box-footer">
@@ -191,11 +190,6 @@ export default {
       this.$refs.upload.clear()
       this.texture = ''
     },
-    showContentPolicy() {
-      this.$alert(this.contentPolicy, {
-        dangerouslyUseHTMLString: true,
-      })
-    },
   },
 }
 </script>
diff --git a/resources/assets/tests/views/skinlib/Upload.test.ts b/resources/assets/tests/views/skinlib/Upload.test.ts
index 377a6fce..67484df9 100644
--- a/resources/assets/tests/views/skinlib/Upload.test.ts
+++ b/resources/assets/tests/views/skinlib/Upload.test.ts
@@ -46,9 +46,9 @@ test('notice should be display if texture is private', () => {
   const wrapper = mount(Upload, {
     stubs: ['file-upload'],
   })
-  expect(wrapper.contains('.callout')).toBeFalse()
+  expect(wrapper.contains('.callout-info')).toBeFalse()
   wrapper.find('[type=checkbox]').setChecked()
-  expect(wrapper.find('.callout').text()).toBe('privacyNotice')
+  expect(wrapper.find('.callout-info').text()).toBe('privacyNotice')
 })
 
 test('display score cost', () => {
@@ -171,8 +171,5 @@ test('show notice about awarding', () => {
 
 test('show content policy', () => {
   const wrapper = mount(Upload)
-  wrapper.find('a').trigger('click')
-  expect(Vue.prototype.$alert).toBeCalledWith('the policy', {
-    dangerouslyUseHTMLString: true,
-  })
+  expect(wrapper.find('.callout-warning').exists()).toBeTrue()
 })