diff options
| author | John Keiser <john@johnkeiser.com> | 2016-09-08 08:35:58 -0700 |
|---|---|---|
| committer | John Keiser <john@johnkeiser.com> | 2016-09-08 08:35:58 -0700 |
| commit | 27bddab04d383d40ee212710712dc8f732cc7df0 (patch) | |
| tree | 70d23c2ffebab2216cccff1f5568d48379d4f8c9 | |
| parent | 512d4914e59ccfdf5fa9cd12dad87024b53b40b8 (diff) | |
| download | chef-27bddab04d383d40ee212710712dc8f732cc7df0.tar.gz | |
Bring in cucumber to prevent cucumber-core from being wrongly loaded
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 12 | ||||
| -rw-r--r-- | version_policy.rb | 3 |
3 files changed, 14 insertions, 4 deletions
@@ -42,7 +42,8 @@ group(:integration) do gem "knife-windows" gem "foodcritic" - gem "cucumber-core", "< 2.0.0" + # We pin this so nobody brings in a cucumber-core incompatible with cucumber latest + gem "cucumber", ">= 2.4.0" # We pin oc-chef-pedant to prevent it from updating out of lockstep with chef-zero gem "oc-chef-pedant", git: "https://github.com/chef/chef-server" end diff --git a/Gemfile.lock b/Gemfile.lock index 25c9a19490..5afb04d34d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -210,8 +210,17 @@ GEM url coderay (1.1.1) colorize (0.8.1) + cucumber (2.4.0) + builder (>= 2.1.2) + cucumber-core (~> 1.5.0) + cucumber-wire (~> 0.0.1) + diff-lcs (>= 1.1.3) + gherkin (~> 4.0) + multi_json (>= 1.7.5, < 2.0) + multi_test (>= 0.1.2) cucumber-core (1.5.0) gherkin (~> 4.0) + cucumber-wire (0.0.1) debug_inspector (0.0.2) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) @@ -332,6 +341,7 @@ GEM wmi-lite (~> 1.0) mixlib-versioning (1.1.0) multi_json (1.12.1) + multi_test (0.1.2) multi_xml (0.5.5) multipart-post (2.0.0) net-http-persistent (2.9.4) @@ -570,7 +580,7 @@ DEPENDENCIES cheffish chefspec chefstyle! - cucumber-core (< 2.0.0) + cucumber (>= 2.4.0) foodcritic github_changelog_generator halite diff --git a/version_policy.rb b/version_policy.rb index cd909d8ffb..aa6ec3e4f4 100644 --- a/version_policy.rb +++ b/version_policy.rb @@ -76,10 +76,9 @@ OMNIBUS_RUBYGEMS_AT_LATEST_VERSION = { # ACCEPTABLE_OUTDATED_GEMS = [ "json", # aws-sdk-v1 pins this because Ruby 2.0; chef-provisioning fix to abandon v1 TBD - "rack", # chef-zero pins this because Ruby 2.0, will be fixed in 5.0 "rubocop", # chefstyle pins this, will often be somewhat behind "slop", # expected to disappear with pry 0.11 - "typhoeus", # until https://github.com/travis-ci/travis.rb/pull/426 is fixed + "typhoeus", # Until the travis gem updates to 1.0. ] # |