- Testing: Add nyc for coverage

- Testing: Test against source (using `esm`) - Linting (ESLint): Remove redundant "use strict" with switch to ESM - npm: Add `test-cov` script
ghfengye · Jan 13, 2020 · 0d84b65 · 0d84b65
1 parent d25655d
commit 0d84b65
Show file tree

Hide file tree

Showing 27 changed files with 67 additions and 60 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,3 +1,4 @@
 node_modules
 dist
 docs/ts
+coverage
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -40,22 +40,15 @@ module.exports = {
           }
       },
       {
-          "files": ["test/**", "test-helpers/node-env.js"],
+          "files": ["test/**"],
           "globals": {
               "assert": "readonly",
-              "jsonpath": "readonly",
-              "require": "readonly",
-              "module": "readonly"
-          },
-          "parserOptions": {
-              "sourceType": "script"
+              "jsonpath": "readonly"
           },
           "env": {"mocha": true},
           "rules": {
-              "strict": ["error", "global"],
-              "import/no-commonjs": 0,
-              "import/unambiguous": 0,
               "quotes": 0,
+              "import/unambiguous": 0,
               // Todo: Reenable
               "max-len": 0
           }

diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ reports
 target
 *.log
 docs/ts
+coverage
diff --git a/.npmignore b/.npmignore
@@ -9,3 +9,5 @@ lgtm.yml
 .idea
 .remarkrc
 docs
+.nyc_output
+coverage
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -69,6 +69,7 @@
     "eslint-plugin-sonarjs": "^0.5.0",
     "eslint-plugin-standard": "^4.0.1",
     "eslint-plugin-unicorn": "^15.0.1",
+    "esm": "^3.2.25",
     "mocha": "^7.0.0",
     "node-static": "^0.7.11",
     "nyc": "^15.0.0",
@@ -89,13 +90,32 @@
   "browserslist": [
     "cover 100%"
   ],
+  "nyc": {
+    "reporter": [
+      "text",
+      "html"
+    ],
+    "exclude": [
+      ".eslintrc.js",
+      "rollup.config.js",
+      ".idea",
+      "coverage",
+      "dist",
+      "demo",
+      "docs",
+      "test",
+      "test-helpers/node-env.js"
+    ]
+  },
   "scripts": {
     "remark": "remark -q -f .",
     "typescript": "tsc src/jsonpath.d.ts",
     "build-docs": "typedoc --out docs/ts src --includeDeclarations",
     "open-docs": "open-cli http://localhost:8084/docs/ts/ && npm start",
-    "mocha": "mocha --require test-helpers/node-env.js test",
+    "coverage": "open-cli http://localhost:8084/coverage/ && npm start",
+    "mocha": "mocha --require esm --require test-helpers/node-env.js test",
     "test": "npm run rollup && npm run mocha",
+    "test-cov": "nyc --all npm run mocha",
     "open": "open-cli http://localhost:8084/demo/ && npm start",
     "start": "static -p 8084",
     "rollup": "rollup -c",

diff --git a/test-helpers/node-env.js b/test-helpers/node-env.js
@@ -1,3 +1,6 @@
-'use strict';
-global.jsonpath = require('../').JSONPath;
-global.assert = require('chai').assert;
+import {assert} from 'chai';
+
+import {JSONPath} from '../src/jsonpath.js';
+
+global.jsonpath = JSONPath;
+global.assert = assert;
diff --git a/test/index.html b/test/index.html
@@ -13,42 +13,42 @@
         <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
         <script src="../node_modules/mocha/mocha.js"></script>
         <script src="../node_modules/chai/chai.js"></script>
-
-        <script src="../dist/index-umd.js"></script>
     </head>
     <body>
         <h1>JSONPath Tests</h1>
         <div id="mocha"></div>
-        <script>
-        /* globals chai, JSONPath */
-        'use strict';
+
+        <script type="module">
+        /* globals chai */
+        import {JSONPath} from '../src/jsonpath.js';
+
         mocha.setup('bdd');
         window.assert = chai.assert;
-        window.jsonpath = JSONPath.JSONPath;
+        window.jsonpath = JSONPath;
         mocha.globals(['jsonpath']);
         </script>
-        <script src="test.all.js"></script>
-        <script src="test.arr.js"></script>
-        <script src="test.at_and_dollar.js"></script>
-        <script src="test.callback.js"></script>
-        <script src="test.custom-properties.js"></script>
-        <script src="test.errors.js"></script>
-        <script src="test.escaping.js"></script>
-        <script src="test.eval.js"></script>
-        <script src="test.examples.js"></script>
-        <script src="test.intermixed.arr.js"></script>
-        <script src="test.parent-selector.js"></script>
-        <script src="test.path_expressions.js"></script>
-        <script src="test.performance.js"></script>
-        <script src="test.pointer.js"></script>
-        <script src="test.properties.js"></script>
-        <script src="test.return.js"></script>
-        <script src="test.toPath.js"></script>
-        <script src="test.toPointer.js"></script>
-        <script src="test.type-operators.js"></script>
 
-        <script>
-        'use strict';
+        <script type="module">
+        import './test.all.js';
+        import './test.arr.js';
+        import './test.at_and_dollar.js';
+        import './test.callback.js';
+        import './test.custom-properties.js';
+        import './test.errors.js';
+        import './test.escaping.js';
+        import './test.eval.js';
+        import './test.examples.js';
+        import './test.intermixed.arr.js';
+        import './test.parent-selector.js';
+        import './test.path_expressions.js';
+        import './test.performance.js';
+        import './test.pointer.js';
+        import './test.properties.js';
+        import './test.return.js';
+        import './test.toPath.js';
+        import './test.toPointer.js';
+        import './test.type-operators.js';
+
         mocha.run();
         </script>
     </body>

diff --git a/test/test.all.js b/test/test.all.js
@@ -1,4 +1,3 @@
-'use strict';
 
 describe('JSONPath - All', function () {
     const json = {

diff --git a/test/test.arr.js b/test/test.arr.js
@@ -1,4 +1,3 @@
-'use strict';
 
 describe('JSONPath - Array', function () {
     const json = {

diff --git a/test/test.at_and_dollar.js b/test/test.at_and_dollar.js
@@ -1,4 +1,3 @@
-'use strict';
 
 describe('JSONPath - At and Dollar sign', function () {
     const t1 = {

diff --git a/test/test.callback.js b/test/test.callback.js
@@ -1,4 +1,3 @@
-'use strict';
 
 describe('JSONPath - Callback', function () {
     const json = {

diff --git a/test/test.custom-properties.js b/test/test.custom-properties.js
@@ -1,4 +1,3 @@
-'use strict';
 
 describe('JSONPath - Custom properties', function () {
     const t1 = {

diff --git a/test/test.errors.js b/test/test.errors.js
@@ -1,4 +1,3 @@
-'use strict';
 
 describe('JSONPath - Errors', function () {
     it('should throw with missing `path`', function () {

diff --git a/test/test.escaping.js b/test/test.escaping.js
@@ -1,4 +1,3 @@
-'use strict';
 
 describe('JSONPath - Escaping', function () {
     const json = {

diff --git a/test/test.eval.js b/test/test.eval.js
@@ -1,4 +1,3 @@
-'use strict';
 
 describe('JSONPath - Eval', function () {
     const json = {

diff --git a/test/test.examples.js b/test/test.examples.js
@@ -1,4 +1,3 @@
-'use strict';
 
 describe('JSONPath - Examples', function () {
     // tests based on examples at http://goessner.net/articles/jsonpath/

diff --git a/test/test.intermixed.arr.js b/test/test.intermixed.arr.js
@@ -1,4 +1,3 @@
-'use strict';
 
 describe('JSONPath - Intermixed Array', function () {
     // tests based on examples at http://goessner.net/articles/jsonpath/

diff --git a/test/test.parent-selector.js b/test/test.parent-selector.js
@@ -1,4 +1,3 @@
-'use strict';
 
 describe('JSONPath - Parent selector', function () {
     const json = {

diff --git a/test/test.path_expressions.js b/test/test.path_expressions.js
@@ -1,4 +1,3 @@
-'use strict';
 
 describe('JSONPath - Path expressions', function () {
     // tests based on examples at http://goessner.net/articles/JsonPath/

diff --git a/test/test.performance.js b/test/test.performance.js
@@ -1,4 +1,3 @@
-'use strict';
 
 describe('JSONPath - Performance', function () {
     const arraySize = 12333,

diff --git a/test/test.pointer.js b/test/test.pointer.js
@@ -1,4 +1,3 @@
-'use strict';
 
 describe('JSONPath - Pointers', function () {
     const json = {

diff --git a/test/test.properties.js b/test/test.properties.js
@@ -1,4 +1,3 @@
-'use strict';
 
 describe('JSONPath - Properties', function () {
     const json = {

diff --git a/test/test.return.js b/test/test.return.js
@@ -1,4 +1,3 @@
-'use strict';
 
 describe('JSONPath - Return', function () {
     const json = {"store": {

diff --git a/test/test.toPath.js b/test/test.toPath.js
@@ -1,4 +1,3 @@
-'use strict';
 
 describe('JSONPath - toPath*', function () {
     it('toPathString', () => {

diff --git a/test/test.toPointer.js b/test/test.toPointer.js
@@ -1,4 +1,3 @@
-'use strict';
 
 describe('JSONPath - toPointer', function () {
     it('toPointer', () => {

diff --git a/test/test.type-operators.js b/test/test.type-operators.js
@@ -1,4 +1,3 @@
-'use strict';
 
 describe('JSONPath - Type Operators', function () {
     // tests based on examples at http://goessner.net/articles/jsonpath/
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,3 +8,4 @@ reports @@
     target
     *.log
     docs/ts
+    coverage