Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compatibility with rspec-puppet 4+ #331

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions onceover.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ Gem::Specification.new do |s|
s.add_runtime_dependency 'r10k', '>=2.1.0'
s.add_runtime_dependency 'rake', '>= 10.0.0'
s.add_runtime_dependency 'rspec', '>= 3.0.0'
s.add_runtime_dependency 'rspec-puppet', ">= 2.4.0"
s.add_runtime_dependency 'rspec-puppet', ">= 2.4.0", '< 6.0.0'
s.add_runtime_dependency 'rspec_junit_formatter', '>= 0.2.0'
s.add_runtime_dependency 'terminal-table', '>= 1.8.0'
s.add_runtime_dependency 'versionomy', '>= 0.5.0'

s.add_development_dependency 'cucumber', '~> 4.1'
s.add_development_dependency 'cucumber', '>= 4.1', '< 10.0.0'
s.add_development_dependency 'pry', '~> 0.13.1'
# We need to depend on rubocop <= 1.12 in order to support Ruby 2.4 (Puppet
# 5). Once we drop support for Puppet 5 we can re-open this
Expand Down
2 changes: 0 additions & 2 deletions templates/spec_helper.rb.erb
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,9 @@ RSpec.configure do |c|
# Also add JUnit output in case people want to use that
c.add_formatter('RSpecJUnitFormatter','<%= repo.tempdir %>/spec.xml')

c.parser = 'future'
<% @formatters.each do |fm| -%>
c.formatter = '<%= fm %>'
<% end -%>
c.trusted_server_facts = true
c.environmentpath = '<%= environmentpath %>'
c.module_path = '<%= modulepath %>'
<% if repo.hiera_config_file_relative_path %>
Expand Down
Loading