From fe2bcdb64f125f85103f1d441aa14d8fb792e31f Mon Sep 17 00:00:00 2001
From: zhenyuWang <13641039885@163.com>
Date: Fri, 25 Aug 2023 20:39:25 +0800
Subject: [PATCH] test(component): general attribute and event

---
 pages/component/view/general-attribute.test.js |  3 ++-
 pages/component/view/general-attribute.uvue    | 17 +++++++++++++++--
 pages/component/view/general-event.test.js     |  5 ++---
 pages/component/view/general-event.uvue        | 12 ++++++------
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/pages/component/view/general-attribute.test.js b/pages/component/view/general-attribute.test.js
index 5534c244..a413554a 100644
--- a/pages/component/view/general-attribute.test.js
+++ b/pages/component/view/general-attribute.test.js
@@ -14,6 +14,7 @@ describe('general attribute', () => {
   it('validateGeneralAttributes', async () => {
     const button = await page.$('.btn')
     await button.tap()
-    expect(await button.text()).toBe('基础属性验证成功')
+    const btnInner = await page.$('.btn-inner')
+    expect(await btnInner.text()).toBe('基础属性验证成功')
   })
 })
diff --git a/pages/component/view/general-attribute.uvue b/pages/component/view/general-attribute.uvue
index 7b5c524d..136edb75 100644
--- a/pages/component/view/general-attribute.uvue
+++ b/pages/component/view/general-attribute.uvue
@@ -6,7 +6,9 @@
       <page-head :title="title"></page-head>
       <view class="uni-padding-wrap uni-common-mt container">
         <view :id="generalId" :class="generalClass" :name="generalName" :title="generalTitle" :data-test="generalData" style="background-color: aqua" ref="general-target"> </view>
-        <button class="btn uni-common-mt" @click="validateGeneralAttributes">{{ validateGeneralAttrText }}</button>
+        <view class="btn uni-common-mt" @click="validateGeneralAttributes">
+          <text class="btn-inner">{{ validateGeneralAttrText }}</text>
+        </view>
         <view class="view-class" :hover-class="hoverClass" ref="view-target">
           <text class="text">按下 50 ms 后背景变红</text>
           <text class="text">抬起 400 ms 后背景恢复</text>
@@ -72,6 +74,17 @@ export default {
 </script>
 
 <style>
+.btn {
+  height: 50px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #409eff;
+  border-radius: 5px;
+}
+.btn-inner {
+  color: #fff;
+}
 .general-class {
   margin: 20px 0 0 50px;
   width: 240px;
@@ -86,7 +99,7 @@ export default {
   background-color: antiquewhite;
 }
 .view-class .text {
-	margin-top: 5px;
+  margin-top: 5px;
   text-align: center;
 }
 .hover-class {
diff --git a/pages/component/view/general-event.test.js b/pages/component/view/general-event.test.js
index aad71745..788890d1 100644
--- a/pages/component/view/general-event.test.js
+++ b/pages/component/view/general-event.test.js
@@ -60,13 +60,12 @@ describe('event trigger sequence', () => {
   it('click', async () => {
     await el.tap()
     const data = await page.data()
-    expect(data.onTapTime).toBeLessThan(data.onClickTime)
+    expect(data.onTapTime).toBeLessThanOrEqual(data.onClickTime)
   })
 
   it('longPress', async () => {
-    const now = Date.now()
     await el.longpress()
     const data = await page.data()
-    expect(now).toBeLessThan(data.onLongPressTime)
+    expect(data.onLongPressTime).toBeGreaterThan(0)
   })
 })
diff --git a/pages/component/view/general-event.uvue b/pages/component/view/general-event.uvue
index 00d1ab5b..5f66de84 100644
--- a/pages/component/view/general-event.uvue
+++ b/pages/component/view/general-event.uvue
@@ -93,31 +93,31 @@ export default {
     onTouchStart(e: TouchEvent){
       this.touchStartEvent = e
       this.onTouchStartTime = Date.now()
-      console.warn('onTouchStart', this.onTouchStartTime)
+      console.log('onTouchStart')
     },
     onTouchMove(e: TouchEvent){
       this.touchMoveEvent = e
       this.onTouchMoveTime = Date.now()
-      console.warn('onTouchMove', this.onTouchMoveTime)
+      console.log('onTouchMove')
     },
     onTouchEnd(e: TouchEvent){
       this.touchEndEvent = e
       this.onTouchEndTime = Date.now()
-      console.warn('onTouchEnd', this.onTouchEndTime)
+      console.log('onTouchEnd')
     },
     onTap(e: MouseEvent){
       this.tapEvent = e
       this.onTapTime = Date.now()
-      console.warn('onTap', this.onTapTime)
+      console.log('onTap')
     },
     onClick(e: MouseEvent){
       this.clickEvent = e
       this.onClickTime = Date.now()
-      console.warn('onClick', this.onClickTime)
+      console.log('onClick')
     },
     onLongPress(){
       this.onLongPressTime = Date.now()
-      console.warn('onLongPress', this.onLongPressTime)
+      console.log('onLongPress')
     },
   },
 }
-- 
GitLab