Skip to content
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

Jump to bottom

Fix and check used common properties #31933

Closed
wants to merge 2 commits into from
Closed

Fix and check used common properties #31933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de4bcae
test: fix usage of invalid common properties
lundibundi Feb 24, 2020
1badb15
test: validate common property usage
lundibundi Feb 24, 2020
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
13 changes: 11 additions & 2 deletions test/common/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ function invalidArgTypeHelper(input) {
return ` Received type ${typeof input} (${inspected})`;
}

module.exports = {
const common = {
allowGlobals,
buildType,
canCreateSymLink,
Expand Down Expand Up @@ -717,7 +717,7 @@ module.exports = {
skipIfReportDisabled,
skipIfWorker,

get enoughTestCPU() {
get enoughTestCpu() {
const cpus = require('os').cpus();
return Array.isArray(cpus) && (cpus.length > 1 || cpus[0].speed > 999);
},
Expand Down Expand Up @@ -815,3 +815,12 @@ module.exports = {
}

};

const validProperties = new Set(Object.keys(common));
module.exports = new Proxy(common, {
get(obj, prop) {
if (!validProperties.has(prop))
throw new Error(`Using invalid common property: '${prop}'`);
return obj[prop];
}
});
2 changes: 0 additions & 2 deletions test/common/index.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ const {
mustNotCall,
printSkipMessage,
skip,
ArrayStream,
nodeProcessAborted,
isAlive,
expectWarning,
Expand Down Expand Up @@ -83,7 +82,6 @@ export {
mustNotCall,
printSkipMessage,
skip,
ArrayStream,
nodeProcessAborted,
isAlive,
expectWarning,
Expand Down