Skip to content

Commit 8b69a66

Browse files
committed
Merge pull request #47 from cyberious/PinBeakerRspec
Pin Beaker-rspec to 4.x until fixed
2 parents 2b7eb09 + b12feb0 commit 8b69a66

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

Gemfile

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,16 @@ gem "puppet", *location_for(ENV['PUPPET_LOCATION'] || '~> 3.4.0')
1414
gem "facter", *location_for(ENV['FACTER_LOCATION'] || '~> 1.6')
1515
gem "hiera", *location_for(ENV['HIERA_LOCATION'] || '~> 1.0')
1616

17-
beaker_version = ENV['BEAKER_VERSION']
17+
beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION'] || '~> 4.0'
1818
group :development, :test do
1919
gem 'rspec'
2020
gem 'mocha'
2121
gem 'mime-types', '<2.0', :require => false
2222
gem 'rake', :require => false
23-
gem 'rspec-puppet', :require => false
2423
gem 'puppetlabs_spec_helper', :require => false
25-
gem 'serverspec', :require => false
2624
gem 'puppet-lint', :require => false
27-
gem 'pry', :require => false
2825
gem 'simplecov', :require => false
29-
if beaker_version
30-
gem 'beaker', *location_for(beaker_version)
31-
else
32-
gem 'beaker', :require => false, :platforms => :ruby
33-
end
34-
gem 'beaker-rspec', :require => false, :platforms => :ruby
26+
gem 'beaker-rspec', *location_for(beaker_rspec_version)
3527
end
3628

3729
# see http://projects.puppetlabs.com/issues/21698

0 commit comments

Comments
 (0)