feat: 1.0.2

Author: theajack

helper/version.md

@@ -29,4 +29,9 @@
 ### 1.0.1
 
 1. 删除 asyncPlugin, 合并到defaultPlugin
-2. 增加 diaabled 参数，可以动态控制禁用某些测试用例
+2. 增加 disabled 参数，可以动态控制禁用某些测试用例
+
+### 1.0.2
+
+1. 修复测试用例耗时不准的bug
+2. 修复disabled参数导致测试无法complete的bug

npm/easy-test-lib.min.js

@@ -1,6 +1,6 @@
 {
     "name": "easy-test-lib",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "description": "A simple and easy-to-use testing lib",
     "main": "easy-test-lib.min.js",
     "bin": {

npm/package.json

@@ -41,6 +41,7 @@ export interface ITestPluginReturn {
     passed: boolean;
     result: any;
     expect?: any;
+    disabled?: boolean;
 }
 
 export interface IOnTestSingleOption extends ITestPluginReturn {

npm/type.d.ts

@@ -1,6 +1,6 @@
 {
     "name": "easy-test-lib",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "description": "A simple and easy-to-use testing lib",
     "scripts": {
         "dev": "webpack-dev-server --open --config webpack-config/dev.js",

package.json

@@ -21,9 +21,12 @@ const config: ITestConfigItem[] = [{
     name: '测试this',
     args: {caseArg: {a: 1}},
     test () {
-        return [this.name, this.args.caseArg];
+        // return [this.name, this.args.caseArg];
+        // console.log(this.expect);
+        return this.expect;
     },
-    expect: ['测试this', {a: 1}]
+    // expect: ['测试this', {a: 1}]
+    expect: window.Symbol(111)
 }];
 
 export default config;

public/cases/test-args.ts

@@ -21,6 +21,16 @@ const defaultCase: ITestConfigItem[] = [{
     expect: [
         11
     ]
+}, {
+    name: '测试Symbol',
+    args: {caseArg: {a: 1}},
+    test () {
+        // return [this.name, this.args.caseArg];
+        // console.log('*****************', this.name, this.expect);
+        return this.expect;
+    },
+    // expect: ['测试this', {a: 1}]
+    expect: window.Symbol(111)
 }];
 
 export default defaultCase;

public/cases/test-default.ts

@@ -18,15 +18,16 @@ startTest({
         ...testDefault,
         testAdd,
         testDom,
+        testAsync,
         ...testObject,
         ...testArgs,
-        testAsync,
     ],
     onTestComplete (result) {
         console.log(`总耗时（${result.time}）ms； 结果：${result.passed ? '通过' : '失败'}`);
         console.log(result);
     },
     onTestSingle (result) {
+        // console.log(result.result);
         console.log(`${result.name}[${result.index}]: 耗时（${result.time}）ms； 结果：${result.passed ? '通过' : '失败'}`);
         if (!result.passed) {
             console.warn(result);

public/index.ts

@@ -4,17 +4,25 @@ import {
 } from '../type';
 import {isValueEqual} from '../util';
 
-const plugin: ITestPlugin = async (item, mergedArgs) => {
-    const {test, expect} = item;
-    let result = test.call(item, mergedArgs);
-    if (result instanceof Promise) {
-        result = await result;
-    }
+function buildResult (result: any, expect: any) {
     return {
         result,
         expect,
         passed: isValueEqual(result, expect),
     };
+}
+
+const plugin: ITestPlugin = (item, mergedArgs) => {
+    const {test, expect} = item;
+    const result = test.call(item, mergedArgs);
+    if (result instanceof Promise) {
+        return new Promise((resolve) => {
+            result.then(data => {
+                resolve(buildResult(data, expect));
+            });
+        });
+    }
+    return buildResult(result, expect);
 };
 
 export default plugin;

src/default-plugin/index.ts

@@ -4,6 +4,7 @@ import {
     ITestPlugin,
     ITestConfigItem,
     ITestPluginConfigItem,
+    ITestPluginReturn,
 } from './type';
 
 import defaultTestPlugin from './default-plugin';
@@ -20,30 +21,54 @@ export const startTest:IStartTest = ({
     const onTestProcess = createTestProcess(onTestSingle, onTestComplete);
     const length = cases.length;
     let testedNum = 0;
-    cases.forEach(async (item, index) => {
-        if (item.disabled) return;
-        const mergedArgs = mergeArgs(args, item.args);
-        if (typeof item.test !== 'function') {
-            item.test = () => item.test; // 支持test传入非函数
-        } else {
-            item.test = item.test.bind(item);
-        }
-        if (typeof item.expect === 'function') { // 支持expect传入函数
-            item.expect = item.expect.call(item, mergedArgs);
-        }
-        const startTime = new Date().getTime();
-        let result = pickPlugin(item, plugin)(item as ITestPluginConfigItem, mergedArgs);
-        if (result instanceof Promise) { // 兼容 async plugin
-            result = await result;
-        }
+
+    const trigTestProcess = ({
+        index, time, result, name = ''
+    }: {
+        index: number, time: number, result: ITestPluginReturn, name?: string,
+    }) => {
         testedNum ++;
         const singleOption: IOnTestSingleOption = {
             ...result,
             index,
-            time: countTime(startTime),
+            time,
         };
-        if (item.name) {singleOption.name = item.name;}
+        if (name) singleOption.name = name;
         onTestProcess(singleOption, testedNum === length);
+    };
+
+    cases.forEach(async (item, index) => {
+        let time: number, result: ITestPluginReturn | Promise<ITestPluginReturn>;
+        if (item.disabled) {
+            time = 0;
+            result = {
+                passed: true,
+                disabled: true,
+                result: '',
+            };
+        } else {
+            const startTime = Date.now();
+            const mergedArgs = mergeArgs(args, item.args);
+            if (typeof item.test !== 'function') {
+                item.test = () => item.test; // 支持test传入非函数
+            } else {
+                item.test = item.test.bind(item);
+            }
+            if (typeof item.expect === 'function') { // 支持expect传入函数
+                item.expect = item.expect.call(item, mergedArgs);
+            }
+            result = pickPlugin(item, plugin)(item as ITestPluginConfigItem, mergedArgs);
+            if (result instanceof Promise) { // 兼容 async plugin
+                result = await result;
+            }
+            time = countTime(startTime);
+        }
+        trigTestProcess({
+            name: item.name,
+            index,
+            time,
+            result,
+        });
     });
 };
 

src/index.ts

@@ -41,6 +41,7 @@ export interface ITestPluginReturn {
     passed: boolean;
     result: any;
     expect?: any;
+    disabled?: boolean;
 }
 
 export interface IOnTestSingleOption extends ITestPluginReturn {

src/type.d.ts

@@ -72,7 +72,7 @@ function objectEqualBaseSingle (resultItem: any, expectItem: any) {
 }
 
 export function countTime (startTime: number): number {
-    return new Date().getTime() - startTime;
+    return Date.now() - startTime;
 }
 
 export function mergeArgs (global: any, local: any) {