Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 16 additions & 0 deletions __tests__/command_helpers/checkCLIForUpdates.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@ const rule = {
version: '--version',
}

const ruleTildeSemver = {
rule: 'cli',
binary: 'npm',
semver: '~5.6.0',
version: '--version',
}

const ruleNoSemver = {
rule: 'cli',
binary: 'yarn',
Expand Down Expand Up @@ -50,5 +57,14 @@ describe('checkCLIForUpdates', () => {
expect(result).toEqual(undefined)
expect(ruleNoSemver.semver).toBe(undefined)
})

it('copies semver ~ symbol if present', async () => {
context.solidarity = {
getVersion: jest.fn(() => '5.8'),
}

const result = await checkCLIForUpdates(ruleTildeSemver, context)
expect(result).toEqual("Setting npm to '~5.8'")
})
})
})
6 changes: 3 additions & 3 deletions src/extensions/functions/checkCLIForUpdates.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ module.exports = async (rule: CLIRule, context: SolidarityRunContext): Promise<s
binarySemantic += '.0'
}

// if it doesn't satisfy, upgrade
// if it doesn't satisfy, upgrade, and retain semver symbol
if (rule.semver && !semver.satisfies(binarySemantic, rule.semver)) {
rule.semver = binaryVersion
rule.semver = `${/\^|\~/.test(rule.semver) ? rule.semver.charAt(0) : ''}${binaryVersion}`
const lineMessage = rule.line ? ` line ${rule.line}` : ''
return print.colors.green(`Setting ${rule.binary}${lineMessage} to '${binaryVersion}'`)
return print.colors.green(`Setting ${rule.binary}${lineMessage} to '${rule.semver}'`)
}
}