Update mocha & nyc version (iTwin#1190)

* Update Mocha & nyc version * Update presentation barrel files to export all module contents * Add nyc in certa Co-authored-by: Grigas <[email protected]> Co-authored-by: Caleb Shafer <[email protected]>
mdresch · May 7, 2021 · 2fb7ed7 · 2fb7ed7
1 parent b5329b6
commit 2fb7ed7
Show file tree

Hide file tree

Showing 161 changed files with 4,657 additions and 3,000 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -282,7 +282,8 @@
       ],
       "outFiles": [
         "${workspaceFolder}/{core,clients}/*/lib/**/*.js",
-        "${workspaceFolder}/ui/abstract/lib/**/*.js"
+        "${workspaceFolder}/ui/abstract/lib/**/*.js",
+        "${workspaceFolder}/tools/certa/lib/**/*.js",
       ],
       "outputCapture": "std",
       "attachSimplePort": 5858, // NB: This must match ports.debugging in core/markup/certa.json
@@ -524,8 +525,8 @@
       "request": "launch",
       "program": "${workspaceFolder}/ui/abstract/node_modules/mocha/bin/_mocha",
       "args": [
-        "--opts",
-        "./mocha.opts",
+        "--config",
+        "../.mocharc.json",
         "--no-timeouts",
         "lib/test/**/*.test.js"
       ],
@@ -547,8 +548,8 @@
       "request": "launch",
       "program": "${workspaceFolder}/ui/components/node_modules/mocha/bin/_mocha",
       "args": [
-        "--opts",
-        "../mocha.opts",
+        "--config",
+        "../.mocharc.json",
         "--no-timeouts",
         "lib/test/**/*.test.js"
       ],
@@ -570,8 +571,8 @@
       "request": "launch",
       "program": "${workspaceFolder}/ui/core/node_modules/mocha/bin/_mocha",
       "args": [
-        "--opts",
-        "../mocha.opts",
+        "--config",
+        "../.mocharc.json",
         "--no-timeouts",
         "lib/test/**/*.test.js"
       ],
@@ -589,8 +590,8 @@
       "request": "launch",
       "program": "${workspaceFolder}/ui/framework/node_modules/mocha/bin/_mocha",
       "args": [
-        "--opts",
-        "../mocha.opts",
+        "--config",
+        "../.mocharc.json",
         "--no-timeouts",
         "lib/test/**/*.test.js"
       ],
@@ -609,8 +610,8 @@
       "request": "launch",
       "program": "${workspaceFolder}/ui/ninezone/node_modules/mocha/bin/_mocha",
       "args": [
-        "--opts",
-        "../mocha.opts",
+        "--config",
+        "../.mocharc.json",
         "--no-timeouts",
         "lib/test/**/*.test.js"
       ],
@@ -649,8 +650,8 @@
       "request": "launch",
       "program": "${workspaceFolder}/presentation/backend/node_modules/mocha/bin/_mocha",
       "args": [
-        "--opts",
-        "../mocha.opts",
+        "--config",
+        "../.mocharc.json",
         "--no-timeouts",
         "lib/test/**/*.test.js"
       ],
@@ -668,8 +669,8 @@
       "request": "launch",
       "program": "${workspaceFolder}/presentation/common/node_modules/mocha/bin/_mocha",
       "args": [
-        "--opts",
-        "../mocha.opts",
+        "--config",
+        "../.mocharc.json",
         "--no-timeouts",
         "lib/test/**/*.test.js"
       ],
@@ -687,8 +688,8 @@
       "request": "launch",
       "program": "${workspaceFolder}/presentation/components/node_modules/mocha/bin/_mocha",
       "args": [
-        "--opts",
-        "../mocha.opts",
+        "--config",
+        "../.mocharc.json",
         "--no-timeouts",
         "-r",
         "ignore-styles",
@@ -710,8 +711,8 @@
       "request": "launch",
       "program": "${workspaceFolder}/presentation/frontend/node_modules/mocha/bin/_mocha",
       "args": [
-        "--opts",
-        "../mocha.opts",
+        "--config",
+        "../.mocharc.json",
         "--no-timeouts",
         "-r",
         "jsdom-global/register",
@@ -731,8 +732,6 @@
       "request": "launch",
       "program": "${workspaceFolder}/full-stack-tests/presentation/node_modules/mocha/bin/_mocha",
       "args": [
-        "--opts",
-        "mocha.opts",
         "-r",
         "jsdom-global/register",
         "-r",
@@ -757,8 +756,8 @@
       "request": "launch",
       "program": "${workspaceFolder}/presentation/testing/node_modules/mocha/bin/_mocha",
       "args": [
-        "--opts",
-        "mocha.opts",
+        "--config",
+        ".mocharc.json",
         "--no-timeouts",
         "lib/test/**/*.test.js"
       ],

diff --git a/clients/backend-application-insights/package.json b/clients/backend-application-insights/package.json
@@ -44,24 +44,20 @@
     "@bentley/eslint-plugin": "2.16.0-dev.27",
     "@bentley/itwin-client": "2.16.0-dev.27",
     "@types/chai": "^4.1.4",
-    "@types/mocha": "^5.2.5",
+    "@types/mocha": "^8.2.2",
     "@types/node": "10.14.1",
     "chai": "^4.1.2",
     "eslint": "^6.8.0",
-    "mocha": "^5.2.0",
-    "nyc": "^14.0.0",
+    "mocha": "^8.3.2",
     "rimraf": "^3.0.2",
     "source-map-loader": "^1.0.0",
     "typescript": "~4.1.0",
     "webpack": "4.42.0"
   },
-  "nyc": {
-    "nycrc-path": "./node_modules/@bentley/build-tools/.nycrc"
-  },
   "eslintConfig": {
     "plugins": [
       "@bentley"
     ],
     "extends": "plugin:@bentley/imodeljs-recommended"
   }
-}
+}
diff --git a/clients/context-registry/package.json b/clients/context-registry/package.json
@@ -51,25 +51,21 @@
     "@bentley/oidc-signin-tool": "2.16.0-dev.27",
     "@types/chai": "^4.1.4",
     "@types/deep-assign": "^0.1.0",
-    "@types/mocha": "^5.2.5",
+    "@types/mocha": "^8.2.2",
     "@types/node": "10.14.1",
     "chai": "^4.1.2",
     "eslint": "^6.8.0",
     "internal-tools": "0.0.0",
-    "mocha": "^5.2.0",
-    "nyc": "^14.0.0",
+    "mocha": "^8.3.2",
     "rimraf": "^3.0.2",
     "source-map-loader": "^1.0.0",
     "typescript": "~4.1.0",
     "webpack": "4.42.0"
   },
-  "nyc": {
-    "nycrc-path": "./node_modules/@bentley/build-tools/.nycrc"
-  },
   "eslintConfig": {
     "plugins": [
       "@bentley"
     ],
     "extends": "plugin:@bentley/imodeljs-recommended"
   }
-}
+}
diff --git a/clients/context-registry/src/test/integration/ContextRegistryClient.test.ts b/clients/context-registry/src/test/integration/ContextRegistryClient.test.ts
@@ -13,7 +13,7 @@ describe("ContextRegistryClient (#integration)", () => {
   let requestContext: AuthorizedClientRequestContext;
 
   before(async function () {
-    this.enableTimeouts(false);
+    this.timeout(0);
     requestContext = await TestConfig.getAuthorizedClientRequestContext();
   });
 

diff --git a/clients/extension/package.json b/clients/extension/package.json
@@ -48,25 +48,21 @@
     "@bentley/eslint-plugin": "2.16.0-dev.27",
     "@bentley/oidc-signin-tool": "2.16.0-dev.27",
     "@types/chai": "^4.1.4",
-    "@types/mocha": "^5.2.5",
+    "@types/mocha": "^8.2.2",
     "@types/node": "10.14.1",
     "chai": "^4.1.2",
     "eslint": "^6.8.0",
     "internal-tools": "0.0.0",
-    "mocha": "^5.2.0",
-    "nyc": "^14.0.0",
+    "mocha": "^8.3.2",
     "rimraf": "^3.0.2",
     "source-map-loader": "^1.0.0",
     "typescript": "~4.1.0",
     "webpack": "4.42.0"
   },
-  "nyc": {
-    "nycrc-path": "./node_modules/@bentley/build-tools/.nycrc"
-  },
   "eslintConfig": {
     "plugins": [
       "@bentley"
     ],
     "extends": "plugin:@bentley/imodeljs-recommended"
   }
-}
+}
diff --git a/clients/frontend-application-insights/package.json b/clients/frontend-application-insights/package.json
@@ -45,24 +45,20 @@
     "@bentley/eslint-plugin": "2.16.0-dev.27",
     "@bentley/itwin-client": "2.16.0-dev.27",
     "@types/chai": "^4.1.4",
-    "@types/mocha": "^5.2.5",
+    "@types/mocha": "^8.2.2",
     "@types/node": "10.14.1",
     "chai": "^4.1.2",
     "eslint": "^6.8.0",
-    "mocha": "^5.2.0",
-    "nyc": "^14.0.0",
+    "mocha": "^8.3.2",
     "rimraf": "^3.0.2",
     "source-map-loader": "^1.0.0",
     "typescript": "~4.1.0",
     "webpack": "4.42.0"
   },
-  "nyc": {
-    "nycrc-path": "./node_modules/@bentley/build-tools/.nycrc"
-  },
   "eslintConfig": {
     "plugins": [
       "@bentley"
     ],
     "extends": "plugin:@bentley/imodeljs-recommended"
   }
-}
+}
diff --git a/clients/itwin/package.json b/clients/itwin/package.json
@@ -45,16 +45,16 @@
     "@types/chai": "^4.1.4",
     "@types/deep-assign": "^0.1.0",
     "@types/js-base64": "^2.3.1",
-    "@types/mocha": "^5.2.5",
+    "@types/mocha": "^8.2.2",
     "@types/node": "10.14.1",
     "@types/qs": "^6.5.0",
     "@types/superagent": "^4.1.7",
     "@types/xmldom": "^0.1.30",
     "chai": "^4.1.2",
     "eslint": "^6.8.0",
-    "mocha": "^5.2.0",
+    "mocha": "^8.3.2",
     "nock": "^12.0.3",
-    "nyc": "^14.0.0",
+    "nyc": "^15.1.0",
     "rimraf": "^3.0.2",
     "source-map-loader": "^1.0.0",
     "typescript": "~4.1.0",
@@ -69,12 +69,12 @@
     "xpath": "0.0.27"
   },
   "nyc": {
-    "nycrc-path": "./node_modules/@bentley/build-tools/.nycrc"
+    "extends": "./node_modules/@bentley/build-tools/.nycrc"
   },
   "eslintConfig": {
     "plugins": [
       "@bentley"
     ],
     "extends": "plugin:@bentley/imodeljs-recommended"
   }
-}
+}
diff --git a/clients/product-settings/package.json b/clients/product-settings/package.json
@@ -49,25 +49,21 @@
     "@bentley/oidc-signin-tool": "2.16.0-dev.27",
     "@bentley/rbac-client": "2.16.0-dev.27",
     "@types/chai": "^4.1.4",
-    "@types/mocha": "^5.2.5",
+    "@types/mocha": "^8.2.2",
     "@types/node": "10.14.1",
     "chai": "^4.1.2",
     "eslint": "^6.8.0",
     "internal-tools": "0.0.0",
-    "mocha": "^5.2.0",
-    "nyc": "^14.0.0",
+    "mocha": "^8.3.2",
     "rimraf": "^3.0.2",
     "source-map-loader": "^1.0.0",
     "typescript": "~4.1.0",
     "webpack": "4.42.0"
   },
-  "nyc": {
-    "nycrc-path": "./node_modules/@bentley/build-tools/.nycrc"
-  },
   "eslintConfig": {
     "plugins": [
       "@bentley"
     ],
     "extends": "plugin:@bentley/imodeljs-recommended"
   }
-}
+}
diff --git a/clients/projectshare/package.json b/clients/projectshare/package.json
@@ -49,25 +49,21 @@
     "@bentley/itwin-client": "2.16.0-dev.27",
     "@bentley/oidc-signin-tool": "2.16.0-dev.27",
     "@types/chai": "^4.1.4",
-    "@types/mocha": "^5.2.5",
+    "@types/mocha": "^8.2.2",
     "@types/node": "10.14.1",
     "chai": "^4.1.2",
     "eslint": "^6.8.0",
     "internal-tools": "0.0.0",
-    "mocha": "^5.2.0",
-    "nyc": "^14.0.0",
+    "mocha": "^8.3.2",
     "rimraf": "^3.0.2",
     "source-map-loader": "^1.0.0",
     "typescript": "~4.1.0",
     "webpack": "4.42.0"
   },
-  "nyc": {
-    "nycrc-path": "./node_modules/@bentley/build-tools/.nycrc"
-  },
   "eslintConfig": {
     "plugins": [
       "@bentley"
     ],
     "extends": "plugin:@bentley/imodeljs-recommended"
   }
-}
+}
diff --git a/clients/rbac/package.json b/clients/rbac/package.json
@@ -50,25 +50,21 @@
     "@bentley/itwin-client": "2.16.0-dev.27",
     "@bentley/oidc-signin-tool": "2.16.0-dev.27",
     "@types/chai": "^4.1.4",
-    "@types/mocha": "^5.2.5",
+    "@types/mocha": "^8.2.2",
     "@types/node": "10.14.1",
     "chai": "^4.1.2",
     "eslint": "^6.8.0",
     "internal-tools": "0.0.0",
-    "mocha": "^5.2.0",
-    "nyc": "^14.0.0",
+    "mocha": "^8.3.2",
     "rimraf": "^3.0.2",
     "source-map-loader": "^1.0.0",
     "typescript": "~4.1.0",
     "webpack": "4.42.0"
   },
-  "nyc": {
-    "nycrc-path": "./node_modules/@bentley/build-tools/.nycrc"
-  },
   "eslintConfig": {
     "plugins": [
       "@bentley"
     ],
     "extends": "plugin:@bentley/imodeljs-recommended"
   }
-}
+}
diff --git a/clients/rbac/src/test/integration/RbacClient.test.ts b/clients/rbac/src/test/integration/RbacClient.test.ts
@@ -21,7 +21,7 @@ describe("RbacClient (#integration)", () => {
   let requestContext: AuthorizedClientRequestContext;
 
   before(async function () {
-    this.enableTimeouts(false);
+    this.timeout(0);
     requestContext = await TestConfig.getAuthorizedClientRequestContext(TestUsers.super);
   });