Skip to content
This repository has been archived by the owner on Jun 6, 2018. It is now read-only.

Commit

Permalink
Update to use new rspec-puppet-facts version
Browse files Browse the repository at this point in the history
  • Loading branch information
stbenjam committed Sep 16, 2016
1 parent 2bb7468 commit 3347976
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
14 changes: 7 additions & 7 deletions moduleroot/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@ rvm:
- 2.0.0
- 2.1.5
env:
- PUPPET_VERSION=3.5
- PUPPET_VERSION=3.5 FUTURE_PARSER=yes
- PUPPET_VERSION=4.0
- PUPPET_VERSION=3.5 ONLY_OS=redhat-6-x86_64,centos-6-x86_64,redhat-7-x86_64,centos-7-x86_64
- PUPPET_VERSION=3.5 FUTURE_PARSER=yes ONLY_OS=redhat-6-x86_64,centos-6-x86_64,redhat-7-x86_64,centos-7-x86_64
- PUPPET_VERSION=4.0 ONLY_OS=redhat-6-x86_64,centos-6-x86_64,redhat-7-x86_64,centos-7-x86_64
matrix:
fast_finish: true
exclude:
# No support for Ruby 1.9.3 on Puppet 4.x
- rvm: 1.9.3
env: PUPPET_VERSION=4.0
env: PUPPET_VERSION=4.0 ONLY_OS=redhat-6-x86_64,centos-6-x86_64,redhat-7-x86_64,centos-7-x86_64
include:
# Only platforms left to support ruby 1.8.7
- rvm: 1.8.7
env: PUPPET_VERSION=3.5
env: PUPPET_VERSION=3.5 ONLY_OS=redhat-6-x86_64,centos-6-x86_64,redhat-7-x86_64,centos-7-x86_64
- rvm: 1.8.7
env: PUPPET_VERSION=3.5 FUTURE_PARSER=yes
# Only Puppet 4.x supports Ruby 2.2. Also limit the OS set we test Ruby 2.2 with.
- rvm: 2.2.3
env: PUPPET_VERSION=4.0
env: PUPPET_VERSION=4.0 ONLY_OS=redhat-6-x86_64,centos-6-x86_64,redhat-7-x86_64,centos-7-x86_64
# Only Puppet >= 4.4 supports Ruby 2.3. Also limit the OS set we test Ruby 2.3 with.
- rvm: 2.3.0
env: PUPPET_VERSION=4.4
env: PUPPET_VERSION=4.4 ONLY_OS=redhat-6-x86_64,centos-6-x86_64,redhat-7-x86_64,centos-7-x86_64
bundler_args: --without development
sudo: false
2 changes: 1 addition & 1 deletion moduleroot/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if RUBY_VERSION.start_with? '1.8'
else
gem 'rake'
gem 'rspec', '~> 3.0'
gem 'rspec-puppet-facts', '>= 1.5'
gem 'rspec-puppet-facts', '>= 1.7'
end
<% (@configs['required'] + (@configs['extra'] || [])).each do |gem| -%>
gem '<%= gem['gem'] %>'<%= ", '#{gem['version']}'" if gem['version'] %><%= ", #{gem['options'].inspect}" if gem['options'] %>
Expand Down
4 changes: 4 additions & 0 deletions moduleroot/spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
require 'rspec-puppet-facts'
include RspecPuppetFacts
add_custom_fact :concat_basedir, '/tmp'
add_custom_fact :mongodb_version, '2.4.14'
add_custom_fact :root_home, '/root'
# Workaround for no method in rspec-puppet to pass undef through :params
class Undef
def inspect; 'undef'; end
Expand Down

0 comments on commit 3347976

Please sign in to comment.