summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHunter Haugen <hunter@puppetlabs.com>2014-11-10 13:42:28 -0800
committerHunter Haugen <hunter@puppetlabs.com>2014-11-10 13:42:28 -0800
commitd8b86fdcc2711bff15a169552641e6fec0546ccd (patch)
tree628294f304b75343bca6c068caff74ebbc098182
parent19f2dd359e98b3615f225daf1b28f70a31bd7487 (diff)
parent85d7eddc41b04c9a9a7bf1a171dd8d3ab157a88a (diff)
downloadpuppet-stdlib-d8b86fdcc2711bff15a169552641e6fec0546ccd.tar.gz
puppet-stdlib-d8b86fdcc2711bff15a169552641e6fec0546ccd.tar.bz2
Merge branch 'master' into 4.4.x
-rw-r--r--Gemfile7
1 files changed, 5 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index c2e58ed..74a16f3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,15 +10,18 @@ def location_for(place, fake_version = nil)
end
end
-group :development, :test do
+group :development, :unit_tests do
gem 'rake', '~> 10.1.0', :require => false
gem 'rspec-puppet', :require => false
gem 'puppetlabs_spec_helper', :require => false
- gem 'serverspec', :require => false
gem 'puppet-lint', :require => false
gem 'pry', :require => false
gem 'simplecov', :require => false
+end
+
+group :system_tests do
gem 'beaker-rspec', :require => false
+ gem 'serverspec', :require => false
end
ENV['GEM_PUPPET_VERSION'] ||= ENV['PUPPET_GEM_VERSION']