Adding several tests for various 'pre-release' situations.

PR-URL: #316 Credit: @raphaelzulliger Close: #316 Reviewed-by: @isaacs
npm · Apr 14, 2020 · f27dcf5 · f27dcf5
1 parent 92bccf1
commit f27dcf5
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 3 deletions.
diff --git a/test/fixtures/range-exclude.js b/test/fixtures/range-exclude.js
@@ -13,6 +13,7 @@ module.exports = [
   ['^1.2.3', '1.2.3-beta'],
   ['=0.7.x', '0.7.0-asdf'],
   ['>=0.7.x', '0.7.0-asdf'],
+  ['<=0.7.x', '0.7.0-asdf'],
   ['1', '1.0.0beta', { loose: 420 }],
   ['<1', '1.0.0beta', true],
   ['< 1', '1.0.0beta', true],
@@ -85,4 +86,20 @@ module.exports = [
   ['1 - 2', '2.0.0-pre'],
   ['1 - 2', '1.0.0-pre'],
   ['1.0 - 2', '1.0.0-pre'],
+
+  ['1.1.x', '1.0.0-a'],
+  ['1.1.x', '1.1.0-a'],
+  ['1.1.x', '1.2.0-a'],
+  ['1.1.x', '1.2.0-a', { includePrerelease: true }],
+  ['1.1.x', '1.0.0-a', { includePrerelease: true }],
+  ['1.x', '1.0.0-a'],
+  ['1.x', '1.1.0-a'],
+  ['1.x', '1.2.0-a'],
+  ['1.x', '0.0.0-a', { includePrerelease: true }],
+  ['1.x', '2.0.0-a', { includePrerelease: true }],
+
+  ['>=1.0.0 <1.1.0', '1.1.0'],
+  ['>=1.0.0 <1.1.0', '1.1.0', { includePrerelease: true }],
+  ['>=1.0.0 <1.1.0', '1.1.0-pre'],
+  ['>=1.0.0 <1.1.0-pre', '1.1.0-pre'],
 ]
diff --git a/test/fixtures/range-include.js b/test/fixtures/range-include.js
@@ -109,6 +109,8 @@ module.exports = [
   ['<=7.x', '7.9.9'],
   ['2.x', '2.0.0-pre.0', { includePrerelease: true }],
   ['2.x', '2.1.0-pre.0', { includePrerelease: true }],
+  ['1.1.x', '1.1.0-a', { includePrerelease: true }],
+  ['1.1.x', '1.1.1-a', { includePrerelease: true }],
   ['*', '1.0.0-rc1', { includePrerelease: true }],
   ['^1.0.0-0', '1.0.1-rc1', { includePrerelease: true }],
   ['^1.0.0-rc2', '1.0.1-rc1', { includePrerelease: true }],
@@ -117,4 +119,10 @@ module.exports = [
   ['1 - 2', '2.0.0-pre', { includePrerelease: true }],
   ['1 - 2', '1.0.0-pre', { includePrerelease: true }],
   ['1.0 - 2', '1.0.0-pre', { includePrerelease: true }],
+
+  ['=0.7.x', '0.7.0-asdf', { includePrerelease: true }],
+  ['>=0.7.x', '0.7.0-asdf', { includePrerelease: true }],
+  ['<=0.7.x', '0.7.0-asdf', { includePrerelease: true }],
+
+  ['>=1.0.0 <=1.1.0', '1.1.0-pre', { includePrerelease: true }],
 ]
diff --git a/test/fixtures/version-gt-range.js b/test/fixtures/version-gt-range.js
@@ -60,5 +60,6 @@ module.exports = [
   ['<1', '1.0.0beta', true],
   ['< 1', '1.0.0beta', true],
   ['=0.7.x', '0.8.2'],
-  ['<0.7.x', '0.7.2']
+  ['<0.7.x', '0.7.2'],
+  ['0.7.x', '0.7.2-beta']
 ]
diff --git a/test/fixtures/version-not-gt-range.js b/test/fixtures/version-not-gt-range.js
@@ -81,5 +81,6 @@ module.exports = [
   ['^0.1.0 || ~3.0.1 || 5.0.0', '3.2.0'],
   ['^0.1.0 || ~3.0.1 || 5.0.0', '1.0.0beta', true],
   ['^0.1.0 || ~3.0.1 || 5.0.0', '5.0.0-0', true],
-  ['^0.1.0 || ~3.0.1 || >4 <=5.0.0', '3.5.0']
+  ['^0.1.0 || ~3.0.1 || >4 <=5.0.0', '3.5.0'],
+  ['0.7.x', '0.7.2-beta', { includePrerelease: true }]
 ]
diff --git a/test/fixtures/version-not-lt-range.js b/test/fixtures/version-not-lt-range.js
@@ -84,5 +84,6 @@ module.exports = [
   ['~1.0.0-alpha', '1.0.0beta', true],
   ['^1.0.0-alpha', '1.0.0-beta'],
   ['~1.0.0-alpha', '1.0.0-beta'],
-  ['=0.1.0', '1.0.0']
+  ['=0.1.0', '1.0.0'],
+  ['>1.2.3', '1.3.0-alpha', { includePrerelease: true }]
 ]