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

Fix a bug when comparing ranged version to non-ranged version #5576

Merged
merged 5 commits into from
Apr 15, 2021
Merged

Fix a bug when comparing ranged version to non-ranged version #5576

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cc8cf5b
Fix a bug when comparing ranged version to non-ranged version
queengooborg Jan 26, 2020
20cc919
Remove special-case code of when both values are ranged
queengooborg Jan 26, 2020
af338d6
Add comment for choice on "0" instead of "1"
queengooborg Mar 19, 2020
ccd077b
Separate complex removed-after-added logic into a separate function
queengooborg Feb 2, 2021
a11cdfd
Add simple docstring
queengooborg Feb 2, 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
31 changes: 15 additions & 16 deletions test/linter/test-versions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,20 @@ function isValidVersion(browserIdentifier, version) {
}
}

/**
* @param {SimpleSupportStatement} statement
* @returns {boolean}
*/
function removedAfterAdded(statement) {
return compareVersions.compare(
statement.version_added.startsWith('≤')
? '0' // 0 was chosen as it's a number lower than any possible browser version
: statement.version_added,
statement.version_removed.replace('≤', ''),
'>=',
);
}

/**
* @param {SupportBlock} supportData
* @param {string} relPath
Expand Down Expand Up @@ -88,22 +102,7 @@ function checkVersions(supportData, relPath, logger) {
typeof statement.version_added === 'string' &&
typeof statement.version_removed === 'string'
) {
if (
(statement.version_added.startsWith('≤') &&
statement.version_removed.startsWith('≤') &&
compareVersions.compare(
statement.version_added.replace('≤', ''),
statement.version_removed.replace('≤', ''),
'<',
)) ||
((!statement.version_added.startsWith('≤') ||
!statement.version_removed.startsWith('≤')) &&
compareVersions.compare(
statement.version_added.replace('≤', ''),
statement.version_removed.replace('≤', ''),
'>=',
))
) {
if (removedAfterAdded(statement)) {
logger.error(
chalk`{red → {bold ${relPath}} - {bold version_removed: "${statement.version_removed}"} must be greater than {bold version_added: "${statement.version_added}"}}`,
);
Expand Down