From f308ce451412c0569a1c4b726f185fa4cc1a5b3e Mon Sep 17 00:00:00 2001
From: Melissa Stone <melissa@puppet.com>
Date: Fri, 18 May 2018 10:36:33 -0700
Subject: (maint) Bump pdk to 1.5.0

---
 spec/spec_helper.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'spec/spec_helper.rb')

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index efd225b..e117192 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,3 +1,4 @@
+
 require 'puppetlabs_spec_helper/module_spec_helper'
 require 'rspec-puppet-facts'
 
@@ -27,4 +28,9 @@ end
 
 RSpec.configure do |c|
   c.default_facts = default_facts
+  c.before :each do
+    # set to strictest setting for testing
+    # by default Puppet runs at warning level
+    Puppet.settings[:strict] = :warning
+  end
 end
-- 
cgit v1.2.3


From 99b8aef830b2eabaf3a217eb08da6deb12e5f8c7 Mon Sep 17 00:00:00 2001
From: Melissa Stone <melissa@puppet.com>
Date: Fri, 18 May 2018 10:41:13 -0700
Subject: (maint) Mock with rspec not mocha

---
 .sync.yml                                          | 3 +++
 spec/shared_behaviours/all_parsedfile_providers.rb | 2 +-
 spec/spec_helper.rb                                | 3 +++
 spec/unit/type/mailalias_spec.rb                   | 4 ++--
 4 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'spec/spec_helper.rb')

diff --git a/.sync.yml b/.sync.yml
index 367f666..34b1c2f 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -26,3 +26,6 @@ Gemfile:
 Rakefile:
   requires:
     - puppet-lint/tasks/puppet-lint
+
+spec/spec_helper.rb:
+  mock_with: ':rspec'
diff --git a/spec/shared_behaviours/all_parsedfile_providers.rb b/spec/shared_behaviours/all_parsedfile_providers.rb
index d697a14..1701fe3 100644
--- a/spec/shared_behaviours/all_parsedfile_providers.rb
+++ b/spec/shared_behaviours/all_parsedfile_providers.rb
@@ -5,7 +5,7 @@ shared_examples_for 'all parsedfile providers' do |provider, *files|
 
   files.flatten.each do |file|
     it "should rewrite #{file} reasonably unchanged" do
-      provider.stubs(:default_target).returns(file)
+      allow(provider).to receive(:default_target).and_return(file)
       provider.prefetch
 
       text = provider.to_file(provider.target_records(file))
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index e117192..b71d71e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,3 +1,6 @@
+RSpec.configure do |c|
+  c.mock_with :rspec
+end
 
 require 'puppetlabs_spec_helper/module_spec_helper'
 require 'rspec-puppet-facts'
diff --git a/spec/unit/type/mailalias_spec.rb b/spec/unit/type/mailalias_spec.rb
index 1fb195e..80b838c 100644
--- a/spec/unit/type/mailalias_spec.rb
+++ b/spec/unit/type/mailalias_spec.rb
@@ -29,13 +29,13 @@ describe Puppet::Type.type(:mailalias) do
 
   it 'tries and set the recipient when it does the sync' do
     expect(recipient_resource.retrieve_resource[:recipient]).to eq(:absent)
-    recipient_resource.property(:recipient).expects(:set).with(['yay'])
+    expect(recipient_resource.property(:recipient)).to receive(:set).with(['yay'])
     recipient_resource.property(:recipient).sync
   end
 
   it 'tries and set the included file when it does the sync' do
     expect(file_resource.retrieve_resource[:file]).to eq(:absent)
-    file_resource.property(:file).expects(:set).with(tmpfile_path)
+    expect(file_resource.property(:file)).to receive(:set).with(tmpfile_path)
     file_resource.property(:file).sync
   end
 
-- 
cgit v1.2.3