Skip to content
This repository was archived by the owner on Sep 2, 2020. It is now read-only.

Commit 6f57111

Browse files
(maint) Update to modern Rspec-puppet setup
To get tests to compile on latest Puppet 5: - dependency on librarian-puppet removed in favour of using puppetlabs_spec_helper / .fixtures.yml to install deps - let blocks to declare the ant class added in various places as Puppet 4/5 seems to be more picky about this - unneeded Gems removed from Gemfile, and bundle updated. - deprecation warnings silenced by removing custom logging functionality from spec_helper.rb.
1 parent cf158f2 commit 6f57111

File tree

10 files changed

+219
-228
lines changed

10 files changed

+219
-228
lines changed

.fixtures.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
fixtures:
2+
forge_modules:
3+
stdlib: puppetlabs/stdlib
4+
wget: maestrodev/wget
25
symlinks:
36
ant: "#{source_dir}"

Gemfile

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
1-
# This file is managed centrally by modulesync
2-
# https://github.com/maestrodev/puppet-modulesync
3-
41
source 'https://rubygems.org'
52

63
gem 'puppet', ENV['PUPPET_VERSION'] || '>= 2.7', :require => false
7-
8-
gem 'rake', :require => false
9-
gem 'rspec-puppet', '>= 1.0.0', :require => false
10-
gem 'puppetlabs_spec_helper', '>= 0.8.0', :require => false
11-
gem 'puppet-lint', '>= 1.1.0', :require => false
12-
gem 'simplecov', :require => false
13-
gem 'puppet-blacksmith', '>= 3.0.0', :require => false
14-
gem 'librarian-puppet', '>= 2.0.0', :require => false
15-
gem 'beaker-rspec', '>= 3.0.0', :require => false
4+
gem 'puppetlabs_spec_helper', :require => false
5+
gem 'beaker-rspec', :require => false
166

177
# vim:ft=ruby

0 commit comments

Comments
 (0)