Merge b423ce1 into 6086e5a

semver.js

@@ -640,7 +640,7 @@ Comparator.prototype.parse = function (comp) {
 
   if (!m) { throw new TypeError('Invalid comparator: ' + comp) }
 
-  this.operator = m[1]
+  this.operator = m[1] !== undefined ? m[1] : ''
   if (this.operator === '=') { this.operator = '' }
 
   // if it literally is just '>' or '' then allow anything.
@@ -654,7 +654,7 @@ Comparator.prototype.toString = function () {
 Comparator.prototype.test = function (version) {
   debug('Comparator.test', version, this.options.loose)
 
-  if (this.semver === ANY) { return true }
+  if (this.semver === ANY || version === ANY) { return true }
 
   if (typeof version === 'string') { version = new SemVer(version, this.options) }
 
@@ -1027,6 +1027,7 @@ function hyphenReplace ($0,
 
 // if ANY of the sets match ALL of its comparators, then pass
 Range.prototype.test = function (version) {
+  if (version === '' || version === ANY) { return true }
   if (!version) { return false }
 
   if (typeof version === 'string') { version = new SemVer(version, this.options) }

test/index.js

@@ -835,7 +835,45 @@ test('\nranges intersect', function (t) {
     ['<1.0.0 >2.0.0', '>1.4.0 <1.6.0 || 2.0.0', false],
     ['>1.0.0 <=2.0.0', '2.0.0', true],
     ['<1.0.0 >=2.0.0', '2.1.0', false],
-    ['<1.0.0 >=2.0.0', '>1.4.0 <1.6.0 || 2.0.0', false]
+    ['<1.0.0 >=2.0.0', '>1.4.0 <1.6.0 || 2.0.0', false],
+    ['*', '0.0.1', true],
+    ['*', '>=1.0.0', true],
+    ['*', '>1.0.0', true],
+    ['*', '~1.0.0', true],
+    ['*', '<1.6.0', true],
+    ['*', '<=1.6.0', true],
+    ['1.*', '0.0.1', false],
+    ['1.*', '2.0.0', false],
+    ['1.*', '1.0.0', true],
+    ['1.*', '<2.0.0', true],
+    ['1.*', '>1.0.0', true],
+    ['1.*', '<=1.0.0', true],
+    ['1.*', '^1.0.0', true],
+    ['1.0.*', '0.0.1', false],
+    ['1.0.*', '<0.0.1', false],
+    ['1.0.*', '>0.0.1', true],
+    ['*', '1.3.0 || <1.0.0 >2.0.0', true],
+    ['1.3.0 || <1.0.0 >2.0.0', '*', true],
+    ['1.*', '1.3.0 || <1.0.0 >2.0.0', true],
+    ['x', '0.0.1', true],
+    ['x', '>=1.0.0', true],
+    ['x', '>1.0.0', true],
+    ['x', '~1.0.0', true],
+    ['x', '<1.6.0', true],
+    ['x', '<=1.6.0', true],
+    ['1.x', '0.0.1', false],
+    ['1.x', '2.0.0', false],
+    ['1.x', '1.0.0', true],
+    ['1.x', '<2.0.0', true],
+    ['1.x', '>1.0.0', true],
+    ['1.x', '<=1.0.0', true],
+    ['1.x', '^1.0.0', true],
+    ['1.0.x', '0.0.1', false],
+    ['1.0.x', '<0.0.1', false],
+    ['1.0.x', '>0.0.1', true],
+    ['x', '1.3.0 || <1.0.0 >2.0.0', true],
+    ['1.3.0 || <1.0.0 >2.0.0', 'x', true],
+    ['1.x', '1.3.0 || <1.0.0 >2.0.0', true]
   ].forEach(function (v) {
     var range1 = new Range(v[0])
     var range2 = new Range(v[1])