合并 swiper2.test.js 解决冲突

pages/component/swiper/swiper.uvue

@@ -9,9 +9,9 @@
           :rebound="reboundSelect" :interval="intervalSelect" :circular="circularSelect"
           :indicator-color="indicatorColor" :indicator-active-color="indicatorColorActive"
           :disable-touch="disableTouchSelect" :current="currentVal" :current-item-id="currentItemIdVal"
-          @change="swiperChange" @transition="swiperTransition" @animationfinish="swiperAnimationfinish">
+          @change="swiperChange" @transition="swiperTransition" @animationfinish="swiperAnimationfinish" @touchstart="swipertouchStart">
           <swiper-item item-id="A">
-            <view class="swiper-item uni-bg-red"><text class="swiper-item-Text">A</text></view>
+            <view class="swiper-item uni-bg-red"><text class="swiper-item-Text" >A</text></view>
           </swiper-item>
           <swiper-item item-id="B">
             <view class="swiper-item uni-bg-green"><text class="swiper-item-Text">B</text></view>
@@ -73,13 +73,13 @@
         <view class="uni-list-cell uni-list-cell-padding">
           <view class="uni-list-cell-db">swiperChange 是否打印</view>
           <switch :checked="swiperChangeSelect" @change="swiperChangeChange" />
-        </view>
-
-        <navigator url="/pages/component/swiper/swiper-list-view">
-          <button type="primary">
-            swiper 嵌套 list-view 测试
-          </button>
-        </navigator>
+        </view>
+
+        <navigator url="/pages/component/swiper/swiper-list-view">
+          <button type="primary">
+            swiper 嵌套 list-view 测试
+          </button>
+        </navigator>
 
       </view>
     </view>
@@ -88,11 +88,11 @@
   <!-- #endif -->
 </template>
 
-<script>
-  type SwiperEventTest = {
-    type: string;
-    target: UniElement | null;
-    currentTarget: UniElement | null;
+<script>
+  type SwiperEventTest = {
+    type : string;
+    target : UniElement | null;
+    currentTarget : UniElement | null;
   }
   export default {
     data() {
@@ -115,24 +115,30 @@
         swiperTransitionSelect: false,
         swiperAnimationfinishSelect: false,
         swiperChangeSelect: false,
-        currentValChange: 0,
-        // 自动化测试
-        changeDetailTest:null as UniSwiperChangeEventDetail | null,
-        transitionDetailTest:null as UniSwiperTransitionEventDetail | null,
-        animationfinishDetailTest:null as UniSwiperAnimationFinishEventDetail | null,
-        isChangeTest:'',
-        isTransitionTest:'',
-        isAnimationfinishTest:''
+        currentValChange: 0,
+        // 自动化测试
+        changeDetailTest: null as UniSwiperChangeEventDetail | null,
+        transitionDetailTest: null as UniSwiperTransitionEventDetail | null,
+        animationfinishDetailTest: null as UniSwiperAnimationFinishEventDetail | null,
+        isChangeTest: '',
+        isTransitionTest: '',
+        isAnimationfinishTest: ''
       }
-    },
-    methods: {
-      swiperChange: function (e : UniSwiperChangeEvent) {
-        this.changeDetailTest = e.detail
-        this.checkEventTest({
-          type:e.type,
-          target:e.target,
-          currentTarget:e.currentTarget
-        } as SwiperEventTest,'change')
+    },
+    methods: {
+      swipertouchStart(e: UniTouchEvent) {
+        console.log("swiper touchstart")
+      },
+      viewtouchStart(e: UniTouchEvent) {
+        console.log("view touchstart:")
+      },
+      swiperChange: function (e : UniSwiperChangeEvent) {
+        this.changeDetailTest = e.detail
+        this.checkEventTest({
+          type: e.type,
+          target: e.target,
+          currentTarget: e.currentTarget
+        } as SwiperEventTest, 'change')
         this.currentValChange = e.detail.current
         console.log(this.currentValChange)
         if (this.swiperChangeSelect) {
@@ -140,47 +146,47 @@
           console.log(e)
         }
       },
-      swiperTransition: function (e : UniSwiperTransitionEvent) {
-        this.transitionDetailTest = e.detail
-        this.checkEventTest({
-          type:e.type,
-          target:e.target,
-          currentTarget:e.currentTarget
-        } as SwiperEventTest,'transition')
+      swiperTransition: function (e : UniSwiperTransitionEvent) {
+        this.transitionDetailTest = e.detail
+        this.checkEventTest({
+          type: e.type,
+          target: e.target,
+          currentTarget: e.currentTarget
+        } as SwiperEventTest, 'transition')
         if (this.swiperTransitionSelect) {
           console.log("swiperTransition")
           console.log(e)
         }
       },
-      swiperAnimationfinish: function (e : UniSwiperAnimationFinishEvent) {
-        this.animationfinishDetailTest = e.detail
-        this.checkEventTest({
-          type:e.type,
-          target:e.target,
-          currentTarget:e.currentTarget
-        } as SwiperEventTest,'animationfinish')
+      swiperAnimationfinish: function (e : UniSwiperAnimationFinishEvent) {
+        this.animationfinishDetailTest = e.detail
+        this.checkEventTest({
+          type: e.type,
+          target: e.target,
+          currentTarget: e.currentTarget
+        } as SwiperEventTest, 'animationfinish')
         if (this.swiperAnimationfinishSelect) {
           console.log("swiperAnimationfinish")
           console.log(e)
         }
       },
-      // 自动化测试专用（由于事件event参数对象中存在循环引用，在ios端JSON.stringify报错，自动化测试无法page.data获取）
-      checkEventTest(e:SwiperEventTest, eventName:String){
-        const isPass = e.type === eventName && e.target instanceof UniElement && e.currentTarget instanceof UniElement;
-        const result = isPass ? `${eventName}:Success` : `${eventName}:Fail`;
-        switch (eventName){
-          case 'change':
-            this.isChangeTest = result
-            break;
-          case 'transition':
-            this.isTransitionTest = result
-            break;
-          case 'animationfinish':
-            this.isAnimationfinishTest = result
-            break;
-          default:
-            break;
-        }
+      // 自动化测试专用（由于事件event参数对象中存在循环引用，在ios端JSON.stringify报错，自动化测试无法page.data获取）
+      checkEventTest(e : SwiperEventTest, eventName : String) {
+        const isPass = e.type === eventName && e.target instanceof UniElement && e.currentTarget instanceof UniElement;
+        const result = isPass ? `${eventName}:Success` : `${eventName}:Fail`;
+        switch (eventName) {
+          case 'change':
+            this.isChangeTest = result
+            break;
+          case 'transition':
+            this.isTransitionTest = result
+            break;
+          case 'animationfinish':
+            this.isAnimationfinishTest = result
+            break;
+          default:
+            break;
+        }
       },
       dotsChange: function (e : UniSwitchChangeEvent) {
         this.dotsSelect = e.detail.value
@@ -194,7 +200,7 @@
       swiperAnimationfinishChange: function (e : UniSwitchChangeEvent) {
         this.swiperAnimationfinishSelect = e.detail.value
       },
-      autoplayChange: function (e : UniSwitchChangeEvent) {
+      autoplayChange: function (e : UniSwitchChangeEvent) {
         this.autoplaySelect = e.detail.value
       },
       verticalChange: function (e : UniSwitchChangeEvent) {

pages/component/swiper/swiper2.test.js

+const PAGE_PATH = '/pages/component/swiper/swiper'
+
+describe('swiper-touch-test', () => {
+
+  // 屏蔽 web 平台
+  if (process.env.uniTestPlatformInfo.startsWith('web')) {
+    it('other platform', () => {
+      expect(1).toBe(1)
+    })
+    return
+  }
+
+  let page
+  beforeAll(async () => {
+    page = await program.reLaunch(PAGE_PATH)
+    await page.waitFor(1500);
+  })
+
+
+  it('swiper-touch-test', async () => {
+
+    await program.swipe({
+      startPoint: {x: 246,y: 193},
+      endPoint: {x: 1,y: 193},
+      duration: 200
+    })
+
+    await page.waitFor(1000)
+    let val = await page.data('currentValChange')
+    console.log(val)
+    expect(val).toEqual(1)
+  })
+
+})

testSequencer.js

@@ -6,6 +6,7 @@ const sortTestFilePaths = [
   "pages/component/list-view/list-view-refresh.test.js",
   "pages/component/scroll-view/scroll-view-refresher.test.js",
   "pages/component/global-events/touch-events.test.js",
+  "pages/component/swiper/swiper2.test.js",
   "pages/component/rich-text/rich-text-complex.test.js"
 ]
 class CustomSequencer extends Sequencer {