Merge pull request #426 from anodelman/master

(BKR-147) add Gemfile setting for BEAKER_VERSION for puppet...
xbezdick · Mar 26, 2015 · 2762bb6 · 2762bb6
2 parents 4dab70b + 2381f7c
commit 2762bb6
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -21,12 +21,17 @@ group :development, :unit_tests do
 end
 
 beaker_version = ENV['BEAKER_VERSION']
+beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
 group :system_tests do
   if beaker_version
-   gem 'beaker', *location_for(beaker_version)
+    gem 'beaker', *location_for(beaker_version)
   end
-  gem 'beaker-rspec',            :require => false
-  gem 'serverspec',              :require => false
+  if beaker_rspec_version
+    gem 'beaker-rspec', *location_for(beaker_rspec_version)
+  else
+    gem 'beaker-rspec',  :require => false
+  end
+  gem 'serverspec',    :require => false
 end
 
 facterversion = ENV['GEM_FACTER_VERSION'] || ENV['FACTER_GEM_VERSION']