Skip to content

Commit 336f498

Browse files
committed
Auto merge of #3260 - Turbo87:release-track, r=pichfl
models/version: Shorten `releaseTrack` for high major versions Example: https://crates.io/crates/rustc-ap-rustc_arena/versions Having `706.x` as the release track barely fits in the release track indicator, so let's shorten this value for major versions above 100.
2 parents f9cb55e + 84b6f1e commit 336f498

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

app/models/version.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export default class Version extends Model {
6666
}
6767

6868
let { semver } = this;
69-
return `${semver.major}.${semver.major === 0 ? semver.minor : 'x'}`;
69+
return semver.major >= 100 ? String(semver.major) : `${semver.major}.${semver.major === 0 ? semver.minor : 'x'}`;
7070
}
7171

7272
@cached get isHighestOfReleaseTrack() {

tests/models/version-test.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,17 @@ module('Model | Version', function (hooks) {
7979
assert.strictEqual(releaseTrack, '0.0');
8080
});
8181

82+
test('123.0.0 has 123 release track', async function (assert) {
83+
let { semver, releaseTrack, isPrerelease } = await prepare(this, { num: '123.0.0' });
84+
assert.strictEqual(semver.major, 123);
85+
assert.strictEqual(semver.minor, 0);
86+
assert.strictEqual(semver.patch, 0);
87+
assert.deepEqual(semver.prerelease, []);
88+
assert.deepEqual(semver.build, []);
89+
assert.false(isPrerelease);
90+
assert.strictEqual(releaseTrack, '123');
91+
});
92+
8293
test('parses 0.3.0-alpha.01 (non-standard) correctly', async function (assert) {
8394
let { semver, releaseTrack, isPrerelease } = await prepare(this, { num: '0.3.0-alpha.01' });
8495
assert.strictEqual(semver.major, 0);

0 commit comments

Comments
 (0)