diff --git a/.travis.yml b/.travis.yml index 8c98919..0025b99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,12 @@ env: - LANG="en_US.UTF-8" install: - - gem update --system 2.7.10 + - if [ "$TRAVIS_RUBY_VERSION" = "2.0.0" ]; then + gem update --system 2.7.7; + else + gem update --system 3.1.3; + fi + - gem install bundler -v "~> 1.17" - rake bootstrap diff --git a/spec/resolver_spec.rb b/spec/resolver_spec.rb index 7f4dcfe..02e9347 100644 --- a/spec/resolver_spec.rb +++ b/spec/resolver_spec.rb @@ -182,7 +182,7 @@ def self.save!(path, name, index, requirements, resolved) Unable to satisfy the following requirements: - `json (>= 1.7.7)` required by `berkshelf (2.0.7)` -- `json (>= 1.4.4, <= 1.7.7)` required by `chef (10.26)` +- `json (<= 1.7.7, >= 1.4.4)` required by `chef (10.26)` EOS expect(conflict.message_with_trees(:version_for_spec => lambda(&:version))).to eq <<-EOS.strip Molinillo could not find compatible versions for possibility named "json": @@ -193,7 +193,7 @@ def self.save!(path, name, index, requirements, resolved) chef_app_error (>= 0) was resolved to 1.0.0, which depends on chef (~> 10.26) was resolved to 10.26, which depends on - json (>= 1.4.4, <= 1.7.7) + json (<= 1.7.7, >= 1.4.4) EOS end end