fix(e2e): fix run dev error & jest test timeout

re #80
WeBankFinTech · Sep 17, 2020 · abe6cfa · abe6cfa
1 parent c432a41
commit abe6cfa
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 18 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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的事件，说明是冒泡的，不再记录