Don't add the external tests stuff to the main Gemfile

2 files changed, 22 insertions, 11 deletions

diff --git a/.travis.yml b/.travis.yml
index 6adae716f9..7e8fd878c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,22 +30,31 @@ matrix:
     gemfile: pedant.gemfile
     script: bundle exec rake pedant
   - rvm: 2.2
+    env: GEMFILE_MOD=\"gem 'cheffish', github: 'chef/cheffish'\"
     script: bundle exec rake cheffish_spec
   - rvm: 2.2
+    env: GEMFILE_MOD=\"gem 'chef-provisioning', github: 'chef/chef-provisioning'\"
     script: bundle exec rake chef_provisioning_spec
   - rvm: 2.2
+    env: GEMFILE_MOD=\"gem 'chef-provisioning-aws', github: 'chef/chef-provisioning-aws'\"
     script: bundle exec rake chef_provisioning_aws_spec
   - rvm: 2.2
+    env: GEMFILE_MOD=\"gem 'chefspec'\"
     script: bundle exec rake chefspec_spec
   - rvm: 2.2
+    env: GEMFILE_MOD=\"gem 'chef-sugar'\"
     script: bundle exec rake chef_sugar_spec
   - rvm: 2.2
+    env: GEMFILE_MOD=\"gem 'chef-rewind'\"
     script: bundle exec rake chef_rewind_spec
   - rvm: 2.2
+    env: GEMFILE_MOD=\"gem 'foodcritic', github: 'acrmp/foodcritic', branch: 'v5.0.0'\"
     script: bundle exec rake foodcritic_spec
   - rvm: 2.2
+    env: GEMFILE_MOD=\"gem 'halite', github: 'poise/halite'\"
     script: bundle exec rake halite_spec
   - rvm: 2.2
+    env: GEMFILE_MOD=\"gem 'poise', github: 'poise/poise'\"
     script: bundle exec rake poise_spec
   # Not working yet: halite
   # - rvm: 2.2
diff --git a/Gemfile b/Gemfile
index 1b5b556665..6075622932 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,19 +26,21 @@ group(:development, :test) do
   gem 'ruby-shadow', :platforms => :ruby unless RUBY_PLATFORM.downcase.match(/(aix|cygwin)/)
 
   # For external tests
-  gem 'chef-zero', github: 'chef/chef-zero'
-  gem 'cheffish', github: 'chef/cheffish'
-  gem 'chef-provisioning', github: 'chef/chef-provisioning'
-  gem 'chef-provisioning-aws', github: 'chef/chef-provisioning-aws'
-  gem 'test-kitchen'
-  gem 'chefspec'
-  gem 'chef-sugar'
-  gem 'poise', github: 'poise/poise', branch: 'deeecb890a6a0bc2037dfb09ce0fd0a8931519aa'
-  gem 'halite', github: 'poise/halite'
-  gem 'foodcritic', github: 'acrmp/foodcritic', branch: 'v5.0.0'
-  gem 'chef-rewind'
+#  gem 'chef-zero', github: 'chef/chef-zero'
+#  gem 'cheffish', github: 'chef/cheffish'
+#  gem 'chef-provisioning'#, github: 'chef/chef-provisioning'
+#  gem 'chef-provisioning-aws', github: 'chef/chef-provisioning-aws'
+#  gem 'test-kitchen'
+#  gem 'chefspec'
+#  gem 'chef-sugar'
+#  gem 'poise', github: 'poise/poise', branch: 'deeecb890a6a0bc2037dfb09ce0fd0a8931519aa'
+#  gem 'halite', github: 'poise/halite'
+#  gem 'foodcritic', github: 'acrmp/foodcritic', branch: 'v5.0.0'
+#  gem 'chef-rewind'
 end
 
+instance_eval(ENV['GEMFILE_MOD'])
+
 # If you want to load debugging tools into the bundle exec sandbox,
 # add these additional dependencies into chef/Gemfile.local
 eval(IO.read(__FILE__ + '.local'), binding) if File.exists?(__FILE__ + '.local')