cma-template-mocha-ts - npm Package Compare versions

Comparing version 1.0.2 to 1.1.0

package.json

 {
   "name": "cma-template-mocha-ts",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "matman project template use Mocha and TypeScript",
@@ -27,3 +27,3 @@ "keywords": [
   },
-  "gitHead": "ac980057dd1ddc64366517c0389e16818b779762"
+  "gitHead": "08c2792dd63d4832ea0ada85078908cf361f7da3"
 }

template.json

@@ -13,11 +13,15 @@ {
       "use-whistle-prod": "cd DevOps/whistle && npm run use-prod",
-      "test": "npm run test:e2e",
+      "test": "npm run test:unit && npm run test:e2e",
+      "test:unit": "npm run coverage",
+      "test:unit:direct": "mocha 'test/unit/**/*.{ts,tsx}'",
       "test:e2e": "node test/run-e2e-test.js",
       "test:e2e:show": "cross-env SHOW_BROWSER=1 npm run test:e2e",
-      "test:e2e:direct": "mocha 'test/**/*.{ts,tsx}'",
+      "test:e2e:direct": "mocha 'test/e2e/**/*.{ts,tsx}'",
       "test:e2e:bootstrap": "node test/bootstrap-sut.js",
-      "test:e2e:bootstrap:dev": "node test/bootstrap-sut-dev.js"
+      "test:e2e:bootstrap:dev": "node test/bootstrap-sut-dev.js",
+      "coverage": "nyc npm run test:unit:direct"
     },
     "devDependencies": {
       "@types/jquery": "^3.5.1",
+      "@types/lodash": "^4.14.161",
       "@types/node": "^14.11.2",
@@ -38,6 +42,8 @@ "clean-webpack-plugin": "^3.0.0",
       "chai": "^4.2.0",
+      "matman-core": "^6.0.17",
       "mocha": "^8.1.3",
-      "mochawesome": "^6.1.1"
+      "mochawesome": "^6.1.1",
+      "nyc": "^15.1.0"
     }
   }
 }

template/README.md

@@ -42,2 +42,5 @@ # 使用 matman 做端对端测试(E2E/UI Testing)
 ```bash
+# 执行单元
+$ npm run test:unit
+
 # 执行 web 端对端测试
@@ -44,0 +47,0 @@ $ npm run test:e2e

template/src/sogou.ts

@@ -1,2 +0,2 @@
-const _ = require('lodash');
+import { getDescribeForRes } from './util'
 
@@ -14,6 +14,6 @@ function bindClickEvent() {
         if (jsonData.retcode === 0) {
-          $('#msg').text(_.concat('来自接口返回：', jsonData.result.description).join(' '));
+          $('#msg').text(getDescribeForRes(jsonData.result.description));
           $('#msg').removeClass('alert-info').addClass('alert-success').addClass('msg-loaded');
         } else {
-          $('#msg').text(_.concat('来自接口返回：', JSON.stringify(jsonData)).join(' '));
+          $('#msg').text(getDescribeForRes(jsonData));
           $('#msg').removeClass('alert-info').addClass('alert-danger').addClass('msg-loaded');
@@ -26,5 +26,6 @@ }
 
+// @ts-ignore
 function iAmNotCalled() {
   // 这段代码没有被调用，因此不会被覆盖率统计到！
-  console.log('I am not called!');
+  console.log('I am not called in sogou.js!');
 }
@@ -31,0 +32,0 @@

template/test/e2e/page_sogou/basic-check-error-100000.test.ts

@@ -0,2 +1,6 @@
+import 'mocha';
 import { expect } from 'chai';
+import { MatmanResult } from 'matman-core';
+
+// @ts-ignore
 import * as checkPage from '../../../DevOps/matman-app/case_modules/page_sogou/basic-check';
@@ -7,3 +11,3 @@
 
-  let resultData;
+  let resultData: MatmanResult;
 
@@ -22,3 +26,3 @@ before(async () => {
   describe('第一步：开始操作之前，等待页面加载完成', () => {
-    let data;
+    let data: any;
 
@@ -61,3 +65,3 @@ before(() => {
   describe('第二步：点击按钮', () => {
-    let data;
+    let data: any;
 
@@ -64,0 +68,0 @@ before(() => {

template/test/e2e/page_sogou/basic-check-type-1.test.ts

@@ -0,2 +1,6 @@
+import 'mocha';
 import { expect } from 'chai';
+import { MatmanResult } from 'matman-core';
+
+// @ts-ignore
 import * as checkPage from '../../../DevOps/matman-app/case_modules/page_sogou/basic-check';
@@ -7,3 +11,3 @@
 
-  let resultData;
+  let resultData: MatmanResult;
 
@@ -22,3 +26,3 @@ before(async () => {
   describe('第一步：开始操作之前，等待页面加载完成', () => {
-    let data;
+    let data: any;
 
@@ -61,3 +65,3 @@ before(() => {
   describe('第二步：点击按钮', () => {
-    let data;
+    let data: any;
 
@@ -64,0 +68,0 @@ before(() => {

template/test/e2e/page_sogou/basic-check-type-2.test.ts

@@ -0,8 +1,12 @@
+import 'mocha';
 import { expect } from 'chai';
-import * as checkPage from '../../../DevOps/matman-app/case_modules/page_sogou/basic-check'
+import { MatmanResult } from 'matman-core';
 
+// @ts-ignore
+import * as checkPage from '../../../DevOps/matman-app/case_modules/page_sogou/basic-check';
+
 describe('搜狗首页：点击获取信息(type=2)', function () {
   this.timeout(30000);
 
-  let resultData;
+  let resultData: MatmanResult;
 
@@ -21,3 +25,3 @@ before(async () => {
   describe('第一步：开始操作之前，等待页面加载完成', () => {
-    let data;
+    let data: any;
 
@@ -60,3 +64,3 @@ before(() => {
   describe('第二步：点击按钮', () => {
-    let data;
+    let data: any;
 
@@ -63,0 +67,0 @@ before(() => {

template/test/e2e/page_sogou/basic-check.test.ts

@@ -0,2 +1,6 @@
+import 'mocha';
 import { expect } from 'chai';
+import { MatmanResult } from 'matman-core';
+
+// @ts-ignore
 import * as checkPage from '../../../DevOps/matman-app/case_modules/page_sogou/basic-check';
@@ -7,3 +11,3 @@
 
-  let resultData;
+  let resultData: MatmanResult;
 
@@ -19,3 +23,3 @@ before(async () => {
   describe('第一步：开始操作之前，等待页面加载完成', () => {
-    let data;
+    let data: any;
 
@@ -58,3 +62,3 @@ before(() => {
   describe('第二步：点击按钮', () => {
-    let data;
+    let data: any;
 
@@ -61,0 +65,0 @@ before(() => {

template/tsconfig.json

 {
-   
-}
+  "compilerOptions": {
+    /* Visit https://aka.ms/tsconfig.json to read more about this file */
+
+    /* Basic Options */
+    // "incremental": true,                   /* Enable incremental compilation */
+    "target": "ES2017" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
+    "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
+    // "lib": [],                             /* Specify library files to be included in the compilation. */
+    // "allowJs": true,                       /* Allow javascript files to be compiled. */
+    // "checkJs": true,                       /* Report errors in .js files. */
+    // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+    // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
+    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    // "sourceMap": true,                     /* Generates corresponding '.map' file. */
+    // "outFile": "./",                       /* Concatenate and emit output to single file. */
+    // "outDir": "./lib"                      /* Redirect output structure to the directory. */,
+    // "rootDir": "./",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+    // "composite": true,                     /* Enable project compilation */
+    // "tsBuildInfoFile": "./",               /* Specify file to store incremental compilation information */
+    // "removeComments": true,                /* Do not emit comments to output. */
+    // "noEmit": true,                        /* Do not emit outputs. */
+    // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
+    // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+    // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+
+    /* Strict Type-Checking Options */
+    "strict": true /* Enable all strict type-checking options. */,
+    // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
+    // "strictNullChecks": true,              /* Enable strict null checks. */
+    // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
+    // "strictBindCallApply": true,           /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
+    // "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
+    // "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
+    // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
+
+    /* Additional Checks */
+    "noUnusedLocals": true /* Report errors on unused locals. */,
+    // "noUnusedParameters": true,            /* Report errors on unused parameters. */
+    "noImplicitReturns": true /* Report error when not all code paths in function return a value. */,
+    "noFallthroughCasesInSwitch": true /* Report errors for fallthrough cases in switch statement. */,
+
+    /* Module Resolution Options */
+    // "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+    // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
+    // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+    // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
+    // "typeRoots": [],                       /* List of folders to include type definitions from. */
+    // "types": [],                           /* Type declaration files to be included in compilation. */
+    // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+    // "esModuleInterop": false /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
+    // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
+    // "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */
+
+    /* Source Map Options */
+    // "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+    // "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
+    // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
+    // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
+    /* Experimental Options */
+    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
+    // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
+
+    /* Advanced Options */
+    "skipLibCheck": true /* Skip type checking of declaration files. */,
+    "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
+  }
+}

template/webpack.dev.config.js

@@ -48,3 +48,3 @@ const path = require('path');
     enforce: 'post',
-    exclude: /node_modules|.\spec\.js$/,
+    exclude: /node_modules|\.spec\.ts$|\.test\.ts$/,
   });
@@ -51,0 +51,0 @@ }

template/webpack.prod.config.js

@@ -48,3 +48,3 @@ const path = require('path');
     enforce: 'post',
-    exclude: /node_modules|.\spec\.js$/,
+    exclude: /node_modules|\.spec\.ts$|\.test\.ts$/,
   });
@@ -51,0 +51,0 @@ }

No alert changes

Improved metrics

Total package byte prevSize

78242

increased by11.71%

Number of package files

54

increased by5.88%

Lines of code

1277

increased by9.61%

No dependency changes