Skip to content

Commit abe6cfa

Browse files
author
fanniehuang
committed
fix(e2e): fix run dev error & jest test timeout
re #80
1 parent c432a41 commit abe6cfa

File tree

4 files changed

+23
-18
lines changed

4 files changed

+23
-18
lines changed

packages/wxa-cli/scripts/buildLib.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
rm -f ./dist/tester/wxa-e2eTest/e2eRecord2jsTpl.ejs
44
rm -rf ./lib-dist/wxa-e2eTest
5-
mkdir ./lib-dist/wxa-e2eTest
5+
mkdir -p ./lib-dist/wxa-e2eTest
6+
mkdir -p ./dist/tester/wxa-e2eTest
67
ln ./src/tester/wxa-e2eTest/e2eTestSuite.js ./lib-dist/wxa-e2eTest/e2eTestSuite.js
78
ln ./src/tester/wxa-e2eTest/e2eRecordBtn.wxa ./lib-dist/wxa-e2eTest/e2eRecordBtn.wxa
89
ln ./src/tester/wxa-e2eTest/e2eRecord2jsTpl.ejs ./dist/tester/wxa-e2eTest/e2eRecord2jsTpl.ejs

packages/wxa-cli/src/tester/wxa-e2eTest/e2eRecord2jsTpl.ejs

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,28 @@
33
import automator from 'miniprogram-automator';
44
import path from 'path';
55

6-
const sleep = t => new Promise(resolve => setTimeout(resolve, t));
7-
describe('==== <%= name %> ====', () => {
8-
let miniProgram;
9-
let page;
6+
let miniProgram;
7+
let page;
108

11-
beforeAll(async () => {
12-
jest.setTimeout(300000);
13-
miniProgram = await automator.launch({
14-
cliPath: '<%= cliPath %>',
15-
projectPath: path.resolve(process.cwd(), './dist/')
16-
});
9+
beforeAll(async () => {
10+
jest.setTimeout(300000);
11+
miniProgram = await automator.launch({
12+
cliPath: '<%= cliPath %>',
13+
projectPath: path.resolve(process.cwd(), './dist/')
14+
});
1715

18-
page = await miniProgram.currentPage();
19-
}, 300000);
16+
page = await miniProgram.currentPage();
17+
}, 300000);
2018

21-
afterAll(async () => {
22-
// await miniProgram.close();
23-
});
19+
afterAll(async () => {
20+
if (miniProgram) await miniProgram.close();
21+
});
22+
23+
const sleep = t => new Promise(resolve => setTimeout(resolve, t));
24+
describe('==== <%= name %> ====', () => {
2425

2526
test('<%= name %>', async () => {
26-
let page = await miniProgram.reLaunch("/<%= record[0].page%>");
27+
page = await miniProgram.reLaunch("/<%= record[0].page%>");
2728
let element;
2829
await page.waitFor(300);
2930

packages/wxa-cli/src/tester/wxa-e2eTest/e2eRecordBtn.wxa

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<view >
3-
<button class="e2e-startRecord" style="top: {{top}}px; left: {{left}}px;" catchtap="tap" bindtouchstart="touchstart" catchtouchmove="touchmove">{{btnText}}</button>
3+
<button class="e2e-startRecord" style="top: {{top}}px; left: {{left}}px;" data-e2ebtn="true" catchtap="tap" bindtouchstart="touchstart" catchtouchmove="touchmove">{{btnText}}</button>
44
<view class="e2e-mask" wx:if="{{showInput}}">
55
<view class="e2e-input">
66
<input bindinput="bindInput" value="{{fileName}}" placeholder="未命名测试用例" />

packages/wxa-cli/src/tester/wxa-e2eTest/e2eTestSuite.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ const shouldRecord = function(type, ...args) {
3535
if (!this.$$isCurrentPage) {
3636
return false;
3737
}
38+
if (e.target.dataset.e2ebtn === 'true') {
39+
return false;
40+
}
3841
let target = e.target.dataset[IDKEY] ? e.target : e.currentTarget;
3942
let id = target.dataset[IDKEY];
4043
// 已经记录过相同timestamp的事件,说明是冒泡的,不再记录

0 commit comments

Comments
 (0)