Skip to content

Update mocha & nyc version #1190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
calebmshafer merged 18 commits into from
May 7, 2021
Merged

Update mocha & nyc version #1190

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
71a7fa3
Update Mocha Version
SaemJeon Apr 13, 2021
4e1ae8d
Merge remote-tracking branch 'origin/master' into update-mocha-version
SaemJeon Apr 13, 2021
3ce226b
Update Mocha & nyc version
SaemJeon Apr 14, 2021
c74a666
Merge remote-tracking branch 'origin' into update-mocha-version
SaemJeon Apr 20, 2021
7530a3e
Fixed EOL issue
SaemJeon Apr 20, 2021
156e0d3
Merge branch 'master' of https://github.com/imodeljs/imodeljs into up…
SaemJeon Apr 20, 2021
066c582
Change presentation barrel files to re-export all module contents
grigasp Apr 21, 2021
62721f3
Run rush change
SaemJeon Apr 21, 2021
d96e450
Merge branch 'master' into update-mocha-version
SaemJeon Apr 21, 2021
e010329
Add nyc in certa
SaemJeon Apr 23, 2021
a722118
Merge branch 'master' into update-mocha-version
SaemJeon May 5, 2021
72216fb
EOL change
SaemJeon May 5, 2021
10ac21d
EOL Changes
SaemJeon May 5, 2021
8cd0110
Merge branch 'master' into update-mocha-version
calebmshafer May 6, 2021
9da09a1
Merge branch 'master' into update-mocha-version
SaemJeon May 6, 2021
41bf1e5
Merge branch 'update-mocha-version' of https://github.com/imodeljs/im…
SaemJeon May 6, 2021
dfd2f10
Fix integration test failure
SaemJeon May 7, 2021
695de3b
Merge branch 'master' into update-mocha-version
SaemJeon May 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 22 additions & 23 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
],
Expand All @@ -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"
],
Expand All @@ -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"
],
Expand All @@ -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"
],
Expand All @@ -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"
],
Expand Down Expand Up @@ -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"
],
Expand All @@ -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"
],
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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"
],
Expand Down
10 changes: 3 additions & 7 deletions clients/backend-application-insights/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,24 +44,20 @@
"@bentley/eslint-plugin": "2.16.0-dev.6",
"@bentley/itwin-client": "2.16.0-dev.6",
"@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"
}
}
}
10 changes: 3 additions & 7 deletions clients/context-registry/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,25 +51,21 @@
"@bentley/oidc-signin-tool": "2.16.0-dev.6",
"@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"
}
}
}
2 changes: 1 addition & 1 deletion clients/context-registry/src/test/integration/ContextRegistryClient.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ describe("ContextRegistryClient (#integration)", () => {
let requestContext: AuthorizedClientRequestContext;

before(async function () {
this.enableTimeouts(false);
this.timeout(0);
requestContext = await TestConfig.getAuthorizedClientRequestContext();
});

Expand Down
10 changes: 3 additions & 7 deletions clients/extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,25 +48,21 @@
"@bentley/eslint-plugin": "2.16.0-dev.6",
"@bentley/oidc-signin-tool": "2.16.0-dev.6",
"@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"
}
}
}
10 changes: 3 additions & 7 deletions clients/frontend-application-insights/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,24 +45,20 @@
"@bentley/eslint-plugin": "2.16.0-dev.6",
"@bentley/itwin-client": "2.16.0-dev.6",
"@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"
}
}
}
10 changes: 5 additions & 5 deletions clients/itwin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,17 @@
"@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/nock": "^11.1.0",
"@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",
Expand All @@ -70,12 +70,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"
}
}
}
10 changes: 3 additions & 7 deletions clients/product-settings/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,25 +49,21 @@
"@bentley/oidc-signin-tool": "2.16.0-dev.6",
"@bentley/rbac-client": "2.16.0-dev.6",
"@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"
}
}
}
10 changes: 3 additions & 7 deletions clients/projectshare/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,25 +49,21 @@
"@bentley/itwin-client": "2.16.0-dev.6",
"@bentley/oidc-signin-tool": "2.16.0-dev.6",
"@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"
}
}
}
10 changes: 3 additions & 7 deletions clients/rbac/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,25 +50,21 @@
"@bentley/itwin-client": "2.16.0-dev.6",
"@bentley/oidc-signin-tool": "2.16.0-dev.6",
"@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"
}
}
}
2 changes: 1 addition & 1 deletion clients/rbac/src/test/integration/RbacClient.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});

Expand Down
Loading