From 85ac69ca939f3be805b9a400ba0e7daafa3dfe98 Mon Sep 17 00:00:00 2001 From: Slava Kim Date: Thu, 15 May 2014 18:36:42 -0700 Subject: [PATCH] Rails based tests for the constraint solver now properly parse and use the ">=" operator --- .../constraint-solver/constraint-solver-tests.js | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/packages/constraint-solver/constraint-solver-tests.js b/packages/constraint-solver/constraint-solver-tests.js index 7aaecc9fd6..c901e9e523 100644 --- a/packages/constraint-solver/constraint-solver-tests.js +++ b/packages/constraint-solver/constraint-solver-tests.js @@ -502,18 +502,6 @@ function getCatalogStub (gems) { dependencies: {} }; - // These gems didn't really follow the semver and they prevent our - // generated tests from being resolved. We set the ECV manually so we can - // get some results as the correctness is not as important as the speed. - if (_.contains(['railties', 'rails', 'activesupport', 'actionpack', 'activerecord', 'activemodel'], packageVersion.packageName) && semver.gte(exactVersion(packageVersion.version), "3.0.0")) - packageVersion.earliestCompatibleVersion = "3.0.0"; - if (_.contains(['devise'], packageVersion.packageName) && semver.gte(exactVersion(packageVersion.version), "3.0.0") && semver.lte(exactVersion(packageVersion.version), "3.7.0")) - packageVersion.earliestCompatibleVersion = "2.0.0"; - if (packageVersion.packageName === "redis") - packageVersion.earliestCompatibleVersion = "0.0.1"; - if (packageVersion.packageName === "github-markup") - packageVersion.earliestCompatibleVersion = "0.3.0"; - _.each(gem.dependencies, function (dep) { var name = dep[0]; var constraints = dep[1]; @@ -555,8 +543,10 @@ function convertConstraints (inp) { if (s.indexOf(">= 0") === 0) return "none"; var x = s.split(' '); - if (x[0] === '~>' || x[0] === '>=' || x[0] === '>') + if (x[0] === '~>') x[0] = ''; + else if (x[0] === '>' || x[0] === '>=') + x[0] = '>='; else if (x[0] === '=') x[0] = '='; else