Skip to content

Commit

Permalink
(maint) pin beaker for ruby 1.8.7
Browse files Browse the repository at this point in the history
Travis is failing on 1.8.7 due to some recent updates in rails. This should fix
the issue.
  • Loading branch information
wkalt committed Jan 5, 2015
1 parent e56eb99 commit 8f0bdc2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
1 change: 1 addition & 0 deletions .travis.yml
@@ -1,5 +1,6 @@
---
language: ruby
bundler_args: --without system_tests
script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
after_success:
- git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-release
Expand Down
9 changes: 6 additions & 3 deletions Gemfile
Expand Up @@ -3,13 +3,16 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
group :development, :test do
gem 'rake'
gem 'puppetlabs_spec_helper', :require => false
gem 'beaker', :require => false
gem 'beaker-rspec', :require => false
gem 'serverspec', :require => false
gem 'rspec-puppet', '~> 1.0'
gem 'puppet-lint', '~> 1.1'
end

group :system_tests do
gem 'beaker', :require => false
gem 'beaker-rspec', :require => false
gem 'serverspec', :require => false
end

if puppetversion = ENV['PUPPET_GEM_VERSION']
gem 'puppet', puppetversion, :require => false
else
Expand Down

0 comments on commit 8f0bdc2

Please sign in to comment.