From 250a665fce27e6ea16895b7c8160a4f9fd0771b4 Mon Sep 17 00:00:00 2001 From: Webber Date: Sun, 22 Dec 2019 21:15:09 +0100 Subject: [PATCH] Make version pattern slightly less strict --- dist/index.js | Bin 128535 -> 128537 bytes src/model/image-tag.js | 2 +- src/model/image-tag.test.js | 18 +++++++++--------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dist/index.js b/dist/index.js index 5942fc9752eca0e890efc8b379192fb0175210fe..24e589bd6f8df236abab36e0cc76580ce74535ff 100644 GIT binary patch delta 20 ccmbRKhJEH6_J%Etf~S~_b+!whVr0_+09xY*O#lD@ delta 17 ZcmbRFhJE@Q_J%Etf~U3%pJHUw0RTv#2JQd= diff --git a/src/model/image-tag.js b/src/model/image-tag.js index 6a596653..d7d516bd 100644 --- a/src/model/image-tag.js +++ b/src/model/image-tag.js @@ -27,7 +27,7 @@ export default class ImageTag { } static get versionPattern() { - return /^20\d{2}\.\d\.\w{4}|3$/; + return /^20\d{2}\.\d\.\w{3,4}|3$/; } static get builderPlatforms() { diff --git a/src/model/image-tag.test.js b/src/model/image-tag.test.js index bbfb2bb9..6a3d4e32 100644 --- a/src/model/image-tag.test.js +++ b/src/model/image-tag.test.js @@ -31,17 +31,17 @@ describe('UnityImageVersion', () => { expect(image.builderPlatform).toStrictEqual(some.builderPlatform); }); - it('throws for incorrect versions', () => { - const { platform } = some; - expect(() => new ImageTag({ version: 'some version', platform })).toThrow(); - expect(() => new ImageTag({ version: '', platform })).toThrow(); - expect(() => new ImageTag({ version: 1, platform })).toThrow(); - expect(() => new ImageTag({ version: null, platform })).toThrow(); + test.each(['2000.0.0f0', '2011.1.11f1'])('accepts %p version format', version => { + expect(() => new ImageTag({ version, platform: some.platform })).not.toThrow(); }); - it('throws for incorrect or unsupported targets', () => { - expect(() => new ImageTag({ platform: undefined })).toThrow(); - expect(() => new ImageTag({ platform: 'nonExisting' })).toThrow(); + test.each(['some version', '', 1, null])('throws for incorrect versions %p', version => { + const { platform } = some; + expect(() => new ImageTag({ version, platform })).toThrow(); + }); + + test.each([undefined, 'nonExisting'])('throws for unsupported target %p', platform => { + expect(() => new ImageTag({ platform })).toThrow(); }); });