Merge pull request puppetlabs#49 from DavidS/pdk-916-mock_with-deprec…

…ation (PDK-916) Avoid the PSH deprecation when not specifying mock_with
TheMeier · Apr 13, 2018 · 699ed86 · 699ed86
2 parents 9fd5725 + a897664
commit 699ed86
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/moduleroot/spec/spec_helper.rb.erb b/moduleroot/spec/spec_helper.rb.erb
@@ -1,3 +1,9 @@
+<%- if @configs['mock_with'] -%>
+RSpec.configure do |c|
+ c.mock_with <%= @configs['mock_with'] %>
+end
+<%- end -%>
+
 require 'puppetlabs_spec_helper/module_spec_helper'
 require 'rspec-puppet-facts'
 
@@ -27,9 +33,6 @@ end
 
 RSpec.configure do |c|
  c.default_facts = default_facts
- <%- if @configs['mock_with'] -%>
- c.mock_with <%= @configs['mock_with'] %>
- <%- end -%>
  <%- if @configs['hiera_config'] -%>
  c.hiera_config = <%= @configs['hiera_config'] %>
  <%- end -%>