fix(e2e): 修复mac开发者路径问题，只有windows才主动查找开发者工具路径

re #80
WeBankFinTech · Aug 10, 2021 · 0f4489f · 0f4489f
1 parent c04f321
commit 0f4489f
Show file tree

Hide file tree

Showing 3 changed files with 12 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.1.6-test-v28",
+  "version": "1.1.6-test-v35",
   "description": "cli for wxa development",
   "main": "dist/wxa.js",
   "scripts": {

diff --git a/packages/wxa-cli/src/tester/wxa-e2eTest/findWechatPath.js b/packages/wxa-cli/src/tester/wxa-e2eTest/findWechatPath.js
@@ -1,9 +1,9 @@
-/* 
+/*
 Windows 环境下去主动查找微信开发者工具安装目录
 uct8086 2021-07-08
 */
 const fs = require('fs');
-const os = require('os'); 
+const os = require('os');
 const sys_readfile = require('util').promisify(fs.readFile);
 const path = require('path');
 const CONFIG_PATH = '微信web开发者工具';
@@ -14,7 +14,10 @@ class FindWechatPath {
     static async start() {
         // 只查Windows平台
         const platform = os.platform();
-        if (!platform.includes('win')) return console.log('Non-Windows system, skip');
+        if (platform !== 'win32') {
+            console.log('Non-Windows system, skip');
+            return;
+        }
         // 有缓存文件就直接读取
         const exists = await fs.existsSync(`${__dirname}/wechat.cfg`);
         if (exists) return await sys_readfile(`${__dirname}/wechat.cfg`, 'utf-8');
@@ -27,7 +30,7 @@ class FindWechatPath {
                 let isDir = await this.checkFile(currentPath);
                 if (isDir) {
                     tempPath = currentPath;
-                    break label;  
+                    break label;
                 }
             }
         }
@@ -55,7 +58,7 @@ class FindWechatPath {
         if (deep >= 4) { // 最深不超过4层
             console.log(dirName);
             return 'begin';
-        } 
+        }
         let filePath = path.resolve(`${dirName}`);
         return new Promise((resolve) => {
             fs.readdir(filePath, async (err, files) => {

diff --git a/packages/wxa-cli/src/tester/wxa-e2eTest/runWechatTools.js b/packages/wxa-cli/src/tester/wxa-e2eTest/runWechatTools.js
@@ -13,8 +13,9 @@ export default async function(cmd, wxaConfigs) {
     };
     let {cliPath} = cmd;
     let wechatwebdevtools = wxaConfigs.wechatwebdevtools;
-    if (!wechatwebdevtools || wechatwebdevtools === '/Applications/wechatwebdevtools.app') {
-        console.log('find wechatWebDevTools......');
+    // window才查路径
+    if (process.platform === 'win32' && (!wechatwebdevtools || wechatwebdevtools === '/Applications/wechatwebdevtools.app')) {
+        console.log('find wechatWebDevTools......', os.platform());
         wechatwebdevtools = await FindWechatPath.start();
         console.log('wechatwebdevtools: ', wechatwebdevtools);
     }