From abe6cfa1b9f065fabfdfa6ce17060b7bb2b86d03 Mon Sep 17 00:00:00 2001
From: fanniehuang <huangm.ss.sysu@gmail.com>
Date: Thu, 17 Sep 2020 18:42:37 +0800
Subject: [PATCH] fix(e2e): fix run dev error & jest test timeout

re #80
---
 packages/wxa-cli/scripts/buildLib.sh          |  3 +-
 .../tester/wxa-e2eTest/e2eRecord2jsTpl.ejs    | 33 ++++++++++---------
 .../src/tester/wxa-e2eTest/e2eRecordBtn.wxa   |  2 +-
 .../src/tester/wxa-e2eTest/e2eTestSuite.js    |  3 ++
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/packages/wxa-cli/scripts/buildLib.sh b/packages/wxa-cli/scripts/buildLib.sh
index fc05f17f..3d7820df 100644
--- a/packages/wxa-cli/scripts/buildLib.sh
+++ b/packages/wxa-cli/scripts/buildLib.sh
@@ -2,7 +2,8 @@
 
 rm -f ./dist/tester/wxa-e2eTest/e2eRecord2jsTpl.ejs
 rm -rf ./lib-dist/wxa-e2eTest
-mkdir ./lib-dist/wxa-e2eTest
+mkdir -p ./lib-dist/wxa-e2eTest
+mkdir -p ./dist/tester/wxa-e2eTest
 ln ./src/tester/wxa-e2eTest/e2eTestSuite.js ./lib-dist/wxa-e2eTest/e2eTestSuite.js
 ln ./src/tester/wxa-e2eTest/e2eRecordBtn.wxa ./lib-dist/wxa-e2eTest/e2eRecordBtn.wxa
 ln ./src/tester/wxa-e2eTest/e2eRecord2jsTpl.ejs ./dist/tester/wxa-e2eTest/e2eRecord2jsTpl.ejs
diff --git a/packages/wxa-cli/src/tester/wxa-e2eTest/e2eRecord2jsTpl.ejs b/packages/wxa-cli/src/tester/wxa-e2eTest/e2eRecord2jsTpl.ejs
index 11311e3a..1b5911a4 100644
--- a/packages/wxa-cli/src/tester/wxa-e2eTest/e2eRecord2jsTpl.ejs
+++ b/packages/wxa-cli/src/tester/wxa-e2eTest/e2eRecord2jsTpl.ejs
@@ -3,27 +3,28 @@
 import automator from 'miniprogram-automator';
 import path from 'path';
 
-const sleep = t => new Promise(resolve => setTimeout(resolve, t));
-describe('==== <%= name %> ====', () => {
-    let miniProgram;
-    let page;
+let miniProgram;
+let page;
 
-    beforeAll(async () => {
-        jest.setTimeout(300000);
-        miniProgram = await automator.launch({
-            cliPath: '<%= cliPath %>',
-            projectPath: path.resolve(process.cwd(), './dist/')
-        });
+beforeAll(async () => {
+    jest.setTimeout(300000);
+    miniProgram = await automator.launch({
+        cliPath: '<%= cliPath %>',
+        projectPath: path.resolve(process.cwd(), './dist/')
+    });
 
-        page = await miniProgram.currentPage();
-    }, 300000);
+    page = await miniProgram.currentPage();
+}, 300000);
 
-    afterAll(async () => {
-        // await miniProgram.close();
-    });
+afterAll(async () => {
+    if (miniProgram) await miniProgram.close();
+});
+
+const sleep = t => new Promise(resolve => setTimeout(resolve, t));
+describe('==== <%= name %> ====', () => {
 
     test('<%= name %>', async () => {
-        let page = await miniProgram.reLaunch("/<%= record[0].page%>");
+        page = await miniProgram.reLaunch("/<%= record[0].page%>");
         let element;
         await page.waitFor(300);
 
diff --git a/packages/wxa-cli/src/tester/wxa-e2eTest/e2eRecordBtn.wxa b/packages/wxa-cli/src/tester/wxa-e2eTest/e2eRecordBtn.wxa
index 8a73d4d2..2c09cf99 100644
--- a/packages/wxa-cli/src/tester/wxa-e2eTest/e2eRecordBtn.wxa
+++ b/packages/wxa-cli/src/tester/wxa-e2eTest/e2eRecordBtn.wxa
@@ -1,6 +1,6 @@
 <template>
     <view >
-        <button class="e2e-startRecord" style="top: {{top}}px; left: {{left}}px;" catchtap="tap" bindtouchstart="touchstart" catchtouchmove="touchmove">{{btnText}}</button>
+        <button class="e2e-startRecord" style="top: {{top}}px; left: {{left}}px;" data-e2ebtn="true" catchtap="tap" bindtouchstart="touchstart" catchtouchmove="touchmove">{{btnText}}</button>
         <view class="e2e-mask" wx:if="{{showInput}}">
             <view class="e2e-input">
                 <input bindinput="bindInput" value="{{fileName}}" placeholder="未命名测试用例" />
diff --git a/packages/wxa-cli/src/tester/wxa-e2eTest/e2eTestSuite.js b/packages/wxa-cli/src/tester/wxa-e2eTest/e2eTestSuite.js
index e02822a0..7e930d38 100644
--- a/packages/wxa-cli/src/tester/wxa-e2eTest/e2eTestSuite.js
+++ b/packages/wxa-cli/src/tester/wxa-e2eTest/e2eTestSuite.js
@@ -35,6 +35,9 @@ const shouldRecord = function(type, ...args) {
     if (!this.$$isCurrentPage) {
         return false;
     }
+    if (e.target.dataset.e2ebtn === 'true') {
+        return false;
+    }
     let target = e.target.dataset[IDKEY] ? e.target : e.currentTarget;
     let id = target.dataset[IDKEY];
     // 已经记录过相同timestamp的事件，说明是冒泡的，不再记录