Simplify external tests and make them work with Gemfile.lock

1 files changed, 19 insertions, 7 deletions

diff --git a/Gemfile b/Gemfile
index 79589ea903..ca6354d107 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,28 +1,40 @@
+# This buys us the ability to be included in other Gemfiles
+require_relative "tasks/gemfile_util"
+extend GemfileUtil
+
 source "https://rubygems.org"
-# path is needed because when we attempt to load this gemspec to look at it from
-# another bundle, it will expand the path relative to the other bundle rather than
-# this file.
-gemspec path: File.dirname(__FILE__), name: "chef"
+gemspec name: "chef"
 
 gem "activesupport", "< 4.0.0", group: :compat_testing, platform: "ruby"
 gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.exist?(File.expand_path("../chef-config", __FILE__))
 # Ensure that we can always install rake, regardless of gem groups
 gem "rake"
+gem "bundler"
+gem "cheffish"
 
 group(:omnibus_package) do
   gem "appbundler"
   gem "rb-readline"
   gem "nokogiri"
 end
-group(:omnibus_package, :development) do
-  gem "cheffish"
-end
 group(:omnibus_package, :pry) do
   gem "pry"
   gem "pry-byebug"
   gem "pry-remote"
   gem "pry-stack_explorer"
 end
+# These are used for external tests
+group(:integration) do
+  gem "chef-provisioning"
+  gem "chef-provisioning-aws"
+  gem "chef-rewind"
+  gem "chef-sugar"
+  gem "chefspec"
+  gem "halite"
+  gem "poise", git: "https://github.com/poise/poise" # until released poise's tests succeed against chef master
+  gem "knife-windows"
+  gem "foodcritic"
+end
 
 group(:docgen) do
   gem "yard"