move mock to test

cenfun · Dec 20, 2023 · fb39c30 · fb39c30
1 parent 6d2ff91
commit fb39c30
Show file tree

Hide file tree

Showing 33 changed files with 50 additions and 36 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,4 @@
 /package-lock.json
 /lib/packages
 /docs/*/.cache
-/mock/*/dist
+/test/mock/*/dist
diff --git a/README.md b/README.md
@@ -26,8 +26,8 @@ await coverageReport.add(coverageData2);
 const coverageResults = await coverageReport.generate();
 console.log(coverageResults.summary);
 ```
-- [example v8](https://github.com/cenfun/monocart-coverage-reports/blob/main/tests/test-v8.js)
-- [example istanbul](https://github.com/cenfun/monocart-coverage-reports/blob/main/tests/test-istanbul.js)
+- [example v8](https://github.com/cenfun/monocart-coverage-reports/blob/main/test/test-v8.js)
+- [example istanbul](https://github.com/cenfun/monocart-coverage-reports/blob/main/test/test-istanbul.js)
 
 ## Default Options
 - [lib/default/options.js](https://github.com/cenfun/monocart-coverage-reports/blob/main/lib/default/options.js)
@@ -111,13 +111,13 @@ console.log(coverageResults.summary);
 
 ## Compare Workflows
 - Istanbul Workflows
-    - 1, Only for source code: instrumenting code with [babel-plugin-istanbul](https://github.com/istanbuljs/babel-plugin-istanbul)，see [webpack.config-istanbul.js](https://github.com/cenfun/monocart-coverage-reports/blob/main/mock/webpack.config-istanbul.js), or using [nyc](https://github.com/istanbuljs/nyc).
-    - 2, Collecting coverage data from browser `window.__coverage__`, see [example](https://github.com/cenfun/monocart-coverage-reports/blob/main/tests/test-istanbul.js).
+    - 1, Only for source code: instrumenting code with [babel-plugin-istanbul](https://github.com/istanbuljs/babel-plugin-istanbul)，see [webpack.config-istanbul.js](https://github.com/cenfun/monocart-coverage-reports/blob/main/test/webpack.config-istanbul.js), or using [nyc](https://github.com/istanbuljs/nyc).
+    - 2, Collecting coverage data from browser `window.__coverage__`, see [example](https://github.com/cenfun/monocart-coverage-reports/blob/main/test/test-istanbul.js).
     - 3, Generating coverage report.
 
 - V8 Workflows
-    - 1, For any runtime code: nothing to do. For source code: building code with `development` [mode](https://webpack.js.org/configuration/mode/) and [sourcemap](https://webpack.js.org/configuration/devtool/) support, see [webpack.config-v8.js](https://github.com/cenfun/monocart-coverage-reports/blob/main/mock/webpack.config-v8.js).
-    - 2, Collecting coverage data with [Chromium Coverage API](#chromium-coverage-api), see [example](https://github.com/cenfun/monocart-coverage-reports/blob/main/tests/test-v8.js).
+    - 1, For any runtime code: nothing to do. For source code: building code with `development` [mode](https://webpack.js.org/configuration/mode/) and [sourcemap](https://webpack.js.org/configuration/devtool/) support, see [webpack.config-v8.js](https://github.com/cenfun/monocart-coverage-reports/blob/main/test/webpack.config-v8.js).
+    - 2, Collecting coverage data with [Chromium Coverage API](#chromium-coverage-api), see [example](https://github.com/cenfun/monocart-coverage-reports/blob/main/test/test-v8.js).
     - 3, Generating coverage report.
 
 ## Chromium Coverage API

diff --git a/package.json b/package.json
@@ -14,17 +14,18 @@
     },
     "types": "./lib/index.d.ts",
     "scripts": {
-        "build-mock": "npm run build-istanbul && npm run build-v8",
-        "build-istanbul": "npx webpack --config mock/webpack.config-istanbul.js",
-        "build-v8": "npx webpack --config mock/webpack.config-v8.js",
-        "test": "node ./tests/test.js && npm run build-docs",
-        "build": "sf lint && sf b -p && npm run build-docs",
-        "dev": "sf d v8",
         "build-docs": "node ./scripts/build-docs.js",
+        "build-test": "npm run build-istanbul && npm run build-v8",
+        "build-istanbul": "npx webpack --config test/webpack.config-istanbul.js",
+        "build-v8": "npx webpack --config test/webpack.config-v8.js",
+        "build": "sf lint && sf b -p && npm run build-test && npm run build-docs",
+        "test": "node ./test/test.js && npm run build-docs",
+        "dev": "sf d v8",
         "patch": "npm run build && sf publish patch -r"
     },
     "workspaces": [
-        "packages/*"
+        "packages/*",
+        "test"
     ],
     "files": [
         "lib"
@@ -46,22 +47,11 @@
         "turbogrid": "~3.0.12"
     },
     "devDependencies": {
-        "babel-loader": "^9.1.3",
-        "babel-plugin-istanbul": "^6.1.1",
         "eslint": "^8.56.0",
         "eslint-config-plus": "^1.0.6",
         "eslint-plugin-html": "^7.1.0",
         "eslint-plugin-vue": "^9.19.2",
-        "github-markdown-css": "^5.5.0",
-        "koa": "^2.14.2",
-        "koa-static-resolver": "^1.0.4",
-        "marked": "^11.1.0",
-        "playwright": "^1.40.1",
         "stylelint": "^15.11.0",
-        "stylelint-config-plus": "^1.0.4",
-        "ts-loader": "^9.5.1",
-        "typescript": "^5.3.3",
-        "webpack": "^5.89.0",
-        "webpack-cli": "^5.1.4"
+        "stylelint-config-plus": "^1.0.4"
     }
-}
+}
diff --git a/mock/index.html → test/mock/index.html b/mock/index.html → test/mock/index.html
diff --git a/mock/istanbul/index.html → test/mock/istanbul/index.html b/mock/istanbul/index.html → test/mock/istanbul/index.html
diff --git a/mock/minify/browser.js → test/mock/minify/browser.js b/mock/minify/browser.js → test/mock/minify/browser.js
diff --git a/mock/minify/comments.js → test/mock/minify/comments.js b/mock/minify/comments.js → test/mock/minify/comments.js
diff --git a/mock/minify/demo.js → test/mock/minify/demo.js b/mock/minify/demo.js → test/mock/minify/demo.js
diff --git a/mock/minify/ie-polyfill.js → test/mock/minify/ie-polyfill.js b/mock/minify/ie-polyfill.js → test/mock/minify/ie-polyfill.js
diff --git a/mock/minify/index.html → test/mock/minify/index.html b/mock/minify/index.html → test/mock/minify/index.html
diff --git a/mock/minify/main.js → test/mock/minify/main.js b/mock/minify/main.js → test/mock/minify/main.js
diff --git a/mock/minify/redirection.js → test/mock/minify/redirection.js b/mock/minify/redirection.js → test/mock/minify/redirection.js
diff --git a/mock/minify/style.css → test/mock/minify/style.css b/mock/minify/style.css → test/mock/minify/style.css
diff --git a/mock/minify/with-map/bootstrap.min.css → test/mock/minify/with-map/bootstrap.min.css b/mock/minify/with-map/bootstrap.min.css → test/mock/minify/with-map/bootstrap.min.css
diff --git a/mock/minify/with-map/bootstrap.min.css.map → ...ock/minify/with-map/bootstrap.min.css.map b/mock/minify/with-map/bootstrap.min.css.map → ...ock/minify/with-map/bootstrap.min.css.map
diff --git a/mock/minify/with-map/coverage-data.js → test/mock/minify/with-map/coverage-data.js b/mock/minify/with-map/coverage-data.js → test/mock/minify/with-map/coverage-data.js
diff --git a/mock/minify/with-map/fps-detector.js → test/mock/minify/with-map/fps-detector.js b/mock/minify/with-map/fps-detector.js → test/mock/minify/with-map/fps-detector.js
diff --git a/mock/minify/with-map/fps-detector.js.map → .../mock/minify/with-map/fps-detector.js.map b/mock/minify/with-map/fps-detector.js.map → .../mock/minify/with-map/fps-detector.js.map
diff --git a/mock/minify/with-map/lithops-ui.js → test/mock/minify/with-map/lithops-ui.js b/mock/minify/with-map/lithops-ui.js → test/mock/minify/with-map/lithops-ui.js
diff --git a/mock/minify/with-map/lithops-ui.js.map → test/mock/minify/with-map/lithops-ui.js.map b/mock/minify/with-map/lithops-ui.js.map → test/mock/minify/with-map/lithops-ui.js.map
diff --git a/mock/minify/with-map/monocart-v8.js → test/mock/minify/with-map/monocart-v8.js b/mock/minify/with-map/monocart-v8.js → test/mock/minify/with-map/monocart-v8.js
diff --git a/mock/minify/with-map/monocart-v8.js.map → test/mock/minify/with-map/monocart-v8.js.map b/mock/minify/with-map/monocart-v8.js.map → test/mock/minify/with-map/monocart-v8.js.map
diff --git a/mock/src/branch.js → test/mock/src/branch.js b/mock/src/branch.js → test/mock/src/branch.js
diff --git a/mock/src/index.js → test/mock/src/index.js b/mock/src/index.js → test/mock/src/index.js
diff --git a/mock/src/typescript.ts → test/mock/src/typescript.ts b/mock/src/typescript.ts → test/mock/src/typescript.ts
diff --git a/mock/v8/index.html → test/mock/v8/index.html b/mock/v8/index.html → test/mock/v8/index.html
diff --git a/test/package.json b/test/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "monocart-coverage-test",
+  "version": "1.0.0",
+  "description": "",
+  "main": "",
+  "scripts": {},
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "babel-loader": "^9.1.3",
+    "babel-plugin-istanbul": "^6.1.1",
+    "github-markdown-css": "^5.5.0",
+    "koa": "^2.14.2",
+    "koa-static-resolver": "^1.0.4",
+    "marked": "^11.1.0",
+    "playwright": "^1.40.1",
+    "ts-loader": "^9.5.1",
+    "typescript": "^5.3.3",
+    "webpack": "^5.89.0",
+    "webpack-cli": "^5.1.4"
+  }
+}
diff --git a/tests/test-istanbul.js → test/test-istanbul.js b/tests/test-istanbul.js → test/test-istanbul.js
diff --git a/tests/test-v8-minify.js → test/test-v8-minify.js b/tests/test-v8-minify.js → test/test-v8-minify.js
diff --git a/tests/test-v8.js → test/test-v8.js b/tests/test-v8.js → test/test-v8.js
diff --git a/tests/test.js → test/test.js b/tests/test.js → test/test.js
@@ -14,7 +14,7 @@ const serverPort = 8130;
 const serverUrl = `http://localhost:${serverPort}`;
 
 const serve = () => {
-    const mockDir = path.resolve(__dirname, '../mock');
+    const mockDir = path.resolve(__dirname, './mock');
 
     console.log('serve dir', mockDir);
 
@@ -94,9 +94,9 @@ const test = async () => {
 
 
     await Promise.all([
-        testV8(serverUrl),
+        testIstanbul(serverUrl),
         testV8Minify(serverUrl),
-        testIstanbul(serverUrl)
+        testV8(serverUrl)
     ]);
 
     console.log('close server ...');

diff --git a/mock/webpack.config-istanbul.js → test/webpack.config-istanbul.js b/mock/webpack.config-istanbul.js → test/webpack.config-istanbul.js
@@ -1,14 +1,13 @@
-// Do NOT put in tests folder
 const path = require('path');
 module.exports = {
     mode: 'development',
 
     devtool: 'source-map',
 
-    entry: path.resolve('mock/src/index.js'),
+    entry: path.resolve('test/mock/src/index.js'),
 
     output: {
-        path: path.resolve('mock/istanbul/dist'),
+        path: path.resolve('test/mock/istanbul/dist'),
         filename: 'coverage-istanbul.js',
         umdNamedDefine: true,
         library: 'coverage-istanbul',
@@ -22,7 +21,10 @@ module.exports = {
                 loader: 'babel-loader',
                 options: {
                     plugins: [
-                        ['istanbul', {}]
+                        ['istanbul', {
+                            // the test or tests folder will be excluded by default
+                            'exclude': []
+                        }]
                     ]
                 }
             }

diff --git a/mock/webpack.config-v8.js → test/webpack.config-v8.js b/mock/webpack.config-v8.js → test/webpack.config-v8.js
@@ -5,10 +5,10 @@ module.exports = {
 
     devtool: 'source-map',
 
-    entry: path.resolve('mock/src/index.js'),
+    entry: path.resolve('test/mock/src/index.js'),
 
     output: {
-        path: path.resolve('mock/v8/dist'),
+        path: path.resolve('test/mock/v8/dist'),
         filename: 'coverage-v8.js',
         umdNamedDefine: true,
         library: 'coverage-v8',