Skip to content

Commit

Permalink
Bring in cucumber to prevent cucumber-core from being wrongly loaded
Browse files Browse the repository at this point in the history
  • Loading branch information
jkeiser committed Sep 8, 2016
1 parent 512d491 commit 27bddab
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 11 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -570,7 +580,7 @@ DEPENDENCIES
cheffish
chefspec
chefstyle!
cucumber-core (< 2.0.0)
cucumber (>= 2.4.0)
foodcritic
github_changelog_generator
halite
Expand Down
3 changes: 1 addition & 2 deletions version_policy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,9 @@
#
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.
]

#
Expand Down

0 comments on commit 27bddab

Please sign in to comment.