fix(e2e): 解决e2e录制时，wxa的fetch接口没有劫持到wx.request

re #80

Author: fanniehuang

packages/wxa-cli/scripts/buildLib.sh

@@ -4,8 +4,9 @@ rm -f ./dist/tester/wxa-e2eTest/e2eTestCaseTpl.ejs
 rm -rf ./lib-dist/wxa-e2eTest
 mkdir -p ./lib-dist/wxa-e2eTest
 mkdir -p ./dist/tester/wxa-e2eTest
+ln ./src/tester/wxa-e2eTest/state.js ./lib-dist/wxa-e2eTest/state.js
 ln ./src/tester/wxa-e2eTest/e2eTestSuite.js ./lib-dist/wxa-e2eTest/e2eTestSuite.js
-ln ./src/tester/wxa-e2eTest/mockWxMethodConfig.js ./lib-dist/wxa-e2eTest/mockWxMethodConfig.js
+ln ./src/tester/wxa-e2eTest/e2eMockWxMethod.js ./lib-dist/wxa-e2eTest/e2eMockWxMethod.js
 ln ./src/tester/wxa-e2eTest/e2eRecordBtn.wxa ./lib-dist/wxa-e2eTest/e2eRecordBtn.wxa
 ln ./src/tester/wxa-e2eTest/e2eTestCaseTpl.ejs ./dist/tester/wxa-e2eTest/e2eTestCaseTpl.ejs
 echo $MODE;

packages/wxa-cli/src/tester/e2eTester.js

@@ -112,8 +112,11 @@ class TesterScheduler extends Schedule {
             (/exports\.default/gm.test(mdl.code) || /exports\[["']default["']/gm.test(mdl.code))
         ) {
             mdl.code = `
+                var __e2e__state = require('wxa://wxa-e2eTest/state.js')
                 var __testSuitePlugin = require('wxa://wxa-e2eTest/e2eTestSuite.js');
-                require('@wxa/core').wxa.use(__testSuitePlugin, {record: ${!!this.cmdOptions.record}});
+                var __e2eMockWxMethod = require('wxa://wxa-e2eTest/e2eMockWxMethod.js');
+                __e2eMockWxMethod({state: __e2e__state});
+                require('@wxa/core').wxa.use(__testSuitePlugin, {record: ${!!this.cmdOptions.record}, state: __e2e__state});
                 ${mdl.code}
             `;
         }

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

@@ -0,0 +1,76 @@
+let state = require('./state.js');
+
+function getKey(configKey) {
+    return `${this.name}__e2e__${configKey.join('__e2e__')}`
+}
+let mockWxMethodConfig = [
+    {
+        name: 'showModal',
+        recordStringify(config) {
+            return getKey.call(this, [
+                config.title, config.content, config.editable, config.showCancel, config.confirmText
+            ])
+        },
+        tpl: (() => {
+            let key = ['config.title || ""', 'config.content || ""', 'config.editable || ""', 'config.showCancel || ""', 'config.confirmText || ""']
+            return `showModal__e2e__\${${key.join('}__e2e__${')}}`
+        })()
+    },
+    {
+        name: 'showActionSheet',
+        recordStringify(config) {
+            return getKey.call(this, [
+                config.alertText, config.itemColor, config.itemList.join(',')
+            ])
+        },
+        tpl: (() => {
+            let key = ['config.alertText  || ""', 'config.itemColor || ""', 'config.itemList.join(",") || ""']
+            return `showActionSheet__e2e__\${${key.join('}__e2e__${')}}`
+        })()
+    },
+    {
+        name: 'request',
+        recordStringify(config) {
+            console.log(getKey.call(this, [
+                config.url, config.method, Object.keys(config.data || {}).join(',')
+            ]));
+            return getKey.call(this, [
+                config.url.split('?')[0], config.method, Object.keys(config.data || {}).join(',')
+            ])
+        },
+        tpl: (() => {
+            let key = ['(config.url && config.url.split("?")[0])  || ""', 'config.method  || ""', 'Object.keys(config.data).join(",")  || ""']
+            return `request__e2e__\${${key.join('}__e2e__${')}}`
+        })()
+    }
+]
+module.exports = function({state}) {
+    mockWxMethodConfig.forEach(item => {
+        let originMethod = wx[item.name];
+        Object.defineProperty(wx, item.name, {
+            configurable: true,
+            enumerable: true,
+            writable: true,
+            value: function() {
+                const config = arguments[0] || {};
+                let { recording, apiRecord } = state;
+                if (recording) {
+                    let key = item.recordStringify(config)
+                    if (!apiRecord.has(key)) {
+                        apiRecord.set(key, [])
+                    }
+                    let originSuccess = config.success;
+                    config.success = function() {
+                        const res = arguments[0] || {};
+                        apiRecord.get(key).push(JSON.parse(JSON.stringify(res)))
+
+                        originSuccess.apply(this, arguments);
+                    }
+                    return originMethod.apply(this, arguments);
+
+                }
+                return originMethod.apply(this, arguments);
+            }
+        })
+    })
+}

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

@@ -1,16 +1,10 @@
 /* eslint-disable no-invalid-this */
 /* eslint-disable no-undef */
-import mockWxMethodConfig from './mockWxMethodConfig';
 
 const IDKEY = '_wxatestuniqueid';
 const EVENTMAPKEY = '_wxatesteventmap';
 let lastEventTime = {};
-let state = {
-    record: [],
-    recording: false,
-    apiRecord: new Map(),
-    recordMode: false
-};
+let state;
 
 // 获取eventMap中对应事件方法
 function getEventFunc(eventType, eventMap) {
@@ -141,6 +135,7 @@ const mountStateAndWrapEvent = (vm) => {
 };
 
 let $$testSuitePlugin = (options) => {
+    state = options.state;
     // vm是当前实例，type为实例类型
     return (vm, type)=>{
         // 劫持wx.request，做apimock
@@ -150,34 +145,6 @@ let $$testSuitePlugin = (options) => {
                 state.recording = true;
                 state.recordMode = true;
             }
-            mockWxMethodConfig.forEach(item => {
-                let originMethod = wx[item.name];
-                Object.defineProperty(wx, item.name, {
-                    configurable: true,
-                    enumerable: true,
-                    writable: true,
-                    value: function() {
-                        const config = arguments[0] || {};
-                        let { recording, apiRecord } = state;
-                        if (recording) {
-                            let key = item.recordStringify(config)
-                            if (!apiRecord.has(key)) {
-                                apiRecord.set(key, [])
-                            }
-                            let originSuccess = config.success;
-                            config.success = function() {
-                                const res = arguments[0] || {};
-                                apiRecord.get(key).push(JSON.parse(JSON.stringify(res)))
-
-                                originSuccess.apply(this, arguments);
-                            }
-                            return originMethod.apply(this, arguments);
-
-                        }
-                        return originMethod.apply(this, arguments);
-                    }
-                })
-            })
         }
         if (['App', 'Page'].indexOf(type) > -1) {
             mountStateAndWrapEvent(vm);

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

@@ -0,0 +1,6 @@
+module.exports = {
+    record: [],
+    recording: false,
+    apiRecord: new Map(),
+    recordMode: false
+}