From 8f0279ec3a77a13919cfc10d8f3cf3fe5b55a9bc Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Mon, 5 Nov 2018 10:11:58 +0100
Subject: [PATCH] fix(docker): null is not a valid version
---
lib/versioning/docker/index.js | 3 +++
test/versioning/docker.spec.js | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/versioning/docker/index.js b/lib/versioning/docker/index.js
index 1124b4f4d5..92a0592e7f 100644
--- a/lib/versioning/docker/index.js
+++ b/lib/versioning/docker/index.js
@@ -52,6 +52,9 @@ function isLessThanRange(version, range) {
return compare(version, range) < 0;
}
function isValid(version) {
+ if (!version) {
+ return null;
+ }
const parsed = parse(version);
return parsed ? version : null;
}
diff --git a/test/versioning/docker.spec.js b/test/versioning/docker.spec.js
index 72acd0755e..cc5e6db048 100644
--- a/test/versioning/docker.spec.js
+++ b/test/versioning/docker.spec.js
@@ -4,6 +4,7 @@ const semver = require('../../lib/versioning')('semver');
describe('docker.isValid(input)', () => {
describe('isValid(version)', () => {
it('should support all versions length', () => {
+ expect(docker.isValid(null)).toBe(null);
expect(docker.isValid('1.2.3')).toBe('1.2.3');
expect(docker.isValid('18.04')).toBe('18.04');
expect(docker.isValid('10.1')).toBe('10.1');
@@ -11,7 +12,7 @@ describe('docker.isValid(input)', () => {
expect(docker.isValid('foo')).toBe(null);
});
});
- describe('isValid(version)', () => {
+ describe('getMajor(version)', () => {
it('should support all versions length', () => {
expect(docker.getMajor('1.2.3')).toBe(1);
expect(docker.getMajor('18.04')).toBe(18);
--
GitLab