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

test(smokehouse): +/- operator #7343

Merged
merged 3 commits into from
Mar 1, 2019
Merged

test(smokehouse): +/- operator #7343

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46d5748
test(smokehouse): +/- operator
connorjclark Feb 27, 2019
a60b630
prefix postfix parts
connorjclark Feb 28, 2019
df47f7d
comment
connorjclark Feb 28, 2019
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
10 changes: 7 additions & 3 deletions lighthouse-cli/test/smokehouse/byte-efficiency/expectations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,13 @@ module.exports = [
details: {
overallSavingsBytes: '>45000',
overallSavingsMs: '>500',
items: {
length: 1,
},
items: [
{
url: 'http://localhost:10200/byte-efficiency/script.js',
wastedBytes: '46481 +/- 100',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so nice!

wastedPercent: '87 +/- 5',
},
],
},
},
'unused-css-rules': {
Expand Down
19 changes: 12 additions & 7 deletions lighthouse-cli/test/smokehouse/smokehouse.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,11 @@ const PROTOCOL_TIMEOUT_EXIT_CODE = 67;
const PAGE_HUNG_EXIT_CODE = 68;
const INSECURE_DOCUMENT_REQUEST_EXIT_CODE = 69;
const RETRIES = 3;
const NUMERICAL_EXPECTATION_REGEXP = /^(<=?|>=?)((\d|\.)+)$/;
const VERBOSE = Boolean(process.env.LH_SMOKE_VERBOSE);
const NUMBER_REGEXP = /(?:\d|\.)+/.source;
const OPS_REGEXP = /<=?|>=?|\+\/-/.source;
const NUMERICAL_EXPECTATION_REGEXP =
new RegExp(`^(${NUMBER_REGEXP})?\\s?(${OPS_REGEXP})\\s?(${NUMBER_REGEXP})$`);
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this clearer than ^((?:\d|\.)+)?\s?(<=?|>=?|\+\/-)\s?((?:\d|\.)+)$

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, but I'm not sure I'd call either of them super clear ;)

maybe we can at least get a comment here explaining what's going on in english?

An optional number, single optional whitespace character, an operator, single optional whitespace character, a number.


/**
* Attempt to resolve a path locally. If this fails, attempts to locate the path
Expand Down Expand Up @@ -149,17 +152,19 @@ function runLighthouse(url, configPath, isDebug) {
function matchesExpectation(actual, expected) {
if (typeof actual === 'number' && NUMERICAL_EXPECTATION_REGEXP.test(expected)) {
const parts = expected.match(NUMERICAL_EXPECTATION_REGEXP);
const operator = parts[1];
const number = parseFloat(parts[2]);
const operator = parts[2];
const numbers = [parts[1], parts[3]].filter(p => typeof p !== 'undefined').map(parseFloat);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it'd make more sense if you nixed the filter and made it explicit

const [prefixNumber, operator, postfixNumber] = parts
// optional named descriptor, though IMO probably unnecessary and might just add cognitive overload
const targetNumber = typeof prefixNumber === 'undefined' ? postfixNumber : prefixNumber

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done. relying on implicit string -> float conversion. doesn't bother me here.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I forgot about the parseFloat bit for a sec 😆

maybe my "optional named descriptor" is more important to me than I realized... haha

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ha, it would probably have been simpler to just move off the switch statement :P

switch (operator) {
case '>':
return actual > number;
return actual > numbers[0];
case '>=':
return actual >= number;
return actual >= numbers[0];
case '<':
return actual < number;
return actual < numbers[0];
case '<=':
return actual <= number;
return actual <= numbers[0];
case '+/-':
return Math.abs(actual - numbers[0]) <= numbers[1];
default:
throw new Error(`unexpected operator ${operator}`);
}
Expand Down