fix: fix branch type regexp to handle version with multiple digits

semantic-release · Dec 13, 2018 · 52ca0b3 · 52ca0b3
1 parent 5d99e02
commit 52ca0b3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/lib/utils.js b/lib/utils.js
@@ -23,11 +23,11 @@ function tagsToVersions(tags) {
 }
 
 function isMajorRange(range) {
-  return /^\d\.x(?:\.x)?$/i.test(range);
+  return /^\d+\.x(?:\.x)?$/i.test(range);
 }
 
 function isMaintenanceRange(range) {
-  return /^\d\.[\dx](?:\.x)?$/i.test(range);
+  return /^\d+\.(?:\d+|x)(?:\.x)?$/i.test(range);
 }
 
 function getUpperBound(range) {

diff --git a/test/utils.test.js b/test/utils.test.js
@@ -33,24 +33,37 @@ test('tagsToVersions', t => {
 
 test('isMajorRange', t => {
   t.false(isMajorRange('1.1.x'));
+  t.false(isMajorRange('1.11.x'));
+  t.false(isMajorRange('11.1.x'));
+  t.false(isMajorRange('11.11.x'));
   t.false(isMajorRange('1.1.X'));
   t.false(isMajorRange('1.1.0'));
 
   t.true(isMajorRange('1.x.x'));
+  t.true(isMajorRange('11.x.x'));
   t.true(isMajorRange('1.X.X'));
   t.true(isMajorRange('1.x'));
+  t.true(isMajorRange('11.x'));
   t.true(isMajorRange('1.X'));
 });
 
 test('isMaintenanceRange', t => {
   t.true(isMaintenanceRange('1.1.x'));
+  t.true(isMaintenanceRange('11.1.x'));
+  t.true(isMaintenanceRange('11.11.x'));
+  t.true(isMaintenanceRange('1.11.x'));
   t.true(isMaintenanceRange('1.x.x'));
+  t.true(isMaintenanceRange('11.x.x'));
   t.true(isMaintenanceRange('1.x'));
+  t.true(isMaintenanceRange('11.x'));
   t.true(isMaintenanceRange('1.1.X'));
   t.true(isMaintenanceRange('1.X.X'));
   t.true(isMaintenanceRange('1.X'));
 
   t.false(isMaintenanceRange('1.1.0'));
+  t.false(isMaintenanceRange('11.1.0'));
+  t.false(isMaintenanceRange('1.11.0'));
+  t.false(isMaintenanceRange('11.11.0'));
   t.false(isMaintenanceRange('~1.0.0'));
   t.false(isMaintenanceRange('^1.0.0'));
 });