Skip to content

Commit 62bc95c

Browse files
authored
models/version: Fix msrv regex (#6394)
1 parent 4f6fad1 commit 62bc95c

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

app/models/version.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export default class Version extends Model {
4141
get msrv() {
4242
let rustVersion = this.rust_version;
4343
// add `.0` suffix if the `rust-version` field only has two version components
44-
return /^.+\..+$/.test(rustVersion) ? `${rustVersion}.0` : rustVersion;
44+
return /^[^.]+\.[^.]+$/.test(rustVersion) ? `${rustVersion}.0` : rustVersion;
4545
}
4646

4747
get isNew() {

tests/models/version-test.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,21 @@ module('Model | Version', function (hooks) {
3636
assert.false(versions[0].isNew);
3737
});
3838

39+
test('msrv', async function (assert) {
40+
let version = await this.store.createRecord('version');
41+
assert.strictEqual(version.msrv, undefined);
42+
43+
version.rust_version = '1.69.1';
44+
assert.strictEqual(version.msrv, '1.69.1');
45+
46+
version.rust_version = '1.69';
47+
assert.strictEqual(version.msrv, '1.69.0');
48+
49+
// this is not actually allowed by the backend
50+
version.rust_version = '1';
51+
assert.strictEqual(version.msrv, '1');
52+
});
53+
3954
module('semver', function () {
4055
async function prepare(context, { num }) {
4156
let { server, store } = context;

0 commit comments

Comments
 (0)