feat(e2e): bug修复

re #80
WeBankFinTech · May 13, 2021 · 8543004 · 8543004
1 parent f5d133d
commit 8543004
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/packages/wxa-cli/package.json b/packages/wxa-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@webank/wxa-cli2-apple",
-  "version": "1.0.79",
+  "version": "1.1.3",
   "description": "cli for wxa development",
   "main": "dist/wxa.js",
   "scripts": {

diff --git a/packages/wxa-cli/src/tester/domWalker.js b/packages/wxa-cli/src/tester/domWalker.js
@@ -80,7 +80,7 @@ class XMLManager {
 
             let keyElement = [pagePath, hash, element.attribs.id];
             if (isIeration){
-                keyElement.push(`-{{${indexVariable}}}`);
+                keyElement.push(`_{{${indexVariable}}}`);
             }
 
             let id = this.assembleUniqueId(keyElement);
@@ -138,7 +138,7 @@ class XMLManager {
     assembleUniqueId(keyElement) {
         return keyElement.reduce((prev, key)=>{
             if (key) {
-                key = key.replace(/[^\w\{\}\-]/g, '');
+                key = key.replace(/[^\w\{\}\_]/g, '');
                 key = key[0].toUpperCase() + key.slice(1);
 
                 return prev + key;

diff --git a/packages/wxa-cli/src/tester/wxa-e2eTest/e2eResultTpl.ejs b/packages/wxa-cli/src/tester/wxa-e2eTest/e2eResultTpl.ejs
@@ -88,7 +88,7 @@
 					}
 					cur_case.diffIndex = diffIndex;
 				})
-			} else if (typeof jest_result !== 'undefined' && jest_result.testResults && jest_result.testResults.length > 0) {
+			} else if (typeof jest_result !== 'undefined' && jest_result && jest_result.testResults && jest_result.testResults.length > 0) {
                 let testResult = jest_result.testResults[0];
                 if (testResult.status === 'failed') {
                     if (testResult.assertionResults.length > 0) {

diff --git a/packages/wxa-cli/src/tester/wxa-e2eTest/runTestCase.js b/packages/wxa-cli/src/tester/wxa-e2eTest/runTestCase.js
@@ -94,7 +94,6 @@ export default async function(cmd, wxaConfigs) {
     } catch(err) {
     }
     // 处理jest结果，方便网页文档读取
-    let jestErrArr = [];
     let jestResJson = JSON.parse(readFile(jestResPath));
     writeFile(jestResPath, `var jest_result = ${JSON.stringify(jestResJson)}`)
 
@@ -128,9 +127,12 @@ export default async function(cmd, wxaConfigs) {
     // 复制文档目录
     shelljs.cp(`-R`, path.join(__dirname, '../../../src/tester/wxa-e2eTest/staticWeb/staticFile'), path.join(testDir, '.doc', 'static'));
     // 使用指定浏览器打开
-    console.log(docPath);
-    open(docPath, { app: {
+    console.log(`生成测试报告：${docPath}`);
+    await open(docPath, { app: {
         name: open.apps.chrome
     }});
-    process.exit(0);
+
+    setTimeout(() => {
+        process.exit(0);
+    }, 5000);
 }
diff --git a/packages/wxa-cli/src/tester/wxa-e2eTest/staticWeb/index.html b/packages/wxa-cli/src/tester/wxa-e2eTest/staticWeb/index.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+    <meta charset="utf-8">
 	<link href="./static/antd.min.css" rel="stylesheet" type="text/css">
 	<link href="./static/style.css" rel="stylesheet" type="text/css">
 </head>