puppet 6.4.0-x64-mingw32 → 6.4.1-x64-mingw32

data/spec/unit/functions/lookup_fixture_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/compiler'
 require 'puppet_spec/files'

data/spec/unit/functions/lookup_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/compiler'
 require 'puppet_spec/files'
@@ -2046,7 +2045,7 @@ describe "The lookup function" do
         end
 
         it 'provides a sensible error message when the hocon library is not loaded' do
-          Puppet.features.stubs(:hocon?).returns(false)
+          allow(Puppet.features).to receive(:hocon?).and_return(false)
 
           expect { lookup('a') }.to raise_error do |e|
             expect(e.message).to match(/Lookup using Hocon data_hash function is not supported without hocon library/)

data/spec/unit/functions/module_directory_spec.rb

@@ -9,35 +9,35 @@ describe 'the module_directory function' do
   include PuppetSpec::Files
 
   it 'returns first found module from one or more given names' do
-    mod = mock 'module'
-    mod.stubs(:path).returns('expected_path')
+    mod = double('module')
+    allow(mod).to receive(:path).and_return('expected_path')
     Puppet[:code] = "notify { module_directory('one', 'two'):}"
     node = Puppet::Node.new('localhost')
     compiler = Puppet::Parser::Compiler.new(node)
-    compiler.environment.stubs(:module).with('one').returns(nil)
-    compiler.environment.stubs(:module).with('two').returns(mod)
+    allow(compiler.environment).to receive(:module).with('one').and_return(nil)
+    allow(compiler.environment).to receive(:module).with('two').and_return(mod)
     expect(compiler.compile()).to have_resource("Notify[expected_path]")
   end
 
   it 'returns first found module from one or more given names in an array' do
-    mod = mock 'module'
-    mod.stubs(:path).returns('expected_path')
+    mod = double('module')
+    allow(mod).to receive(:path).and_return('expected_path')
     Puppet[:code] = "notify { module_directory(['one', 'two']):}"
     node = Puppet::Node.new('localhost')
     compiler = Puppet::Parser::Compiler.new(node)
-    compiler.environment.stubs(:module).with('one').returns(nil)
-    compiler.environment.stubs(:module).with('two').returns(mod)
+    allow(compiler.environment).to receive(:module).with('one').and_return(nil)
+    allow(compiler.environment).to receive(:module).with('two').and_return(mod)
     expect(compiler.compile()).to have_resource("Notify[expected_path]")
   end
 
   it 'returns undef when none of the modules were found' do
-    mod = mock 'module'
-    mod.stubs(:path).returns('expected_path')
+    mod = double('module')
+    allow(mod).to receive(:path).and_return('expected_path')
     Puppet[:code] = "notify { String(type(module_directory('one', 'two'))):}"
     node = Puppet::Node.new('localhost')
     compiler = Puppet::Parser::Compiler.new(node)
-    compiler.environment.stubs(:module).with('one').returns(nil)
-    compiler.environment.stubs(:module).with('two').returns(nil)
+    allow(compiler.environment).to receive(:module).with('one').and_return(nil)
+    allow(compiler.environment).to receive(:module).with('two').and_return(nil)
     expect(compiler.compile()).to have_resource("Notify[Undef]")
   end
 end

data/spec/unit/functions/require_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/compiler'
 require 'puppet/parser/functions'
@@ -7,7 +6,6 @@ require 'matchers/resource'
 require 'matchers/include_in_order'
 require 'unit/functions/shared'
 
-
 describe 'The "require" function' do
   include PuppetSpec::Compiler
   include ContainmentMatchers
@@ -81,5 +79,4 @@ describe 'The "require" function' do
   it_should_behave_like 'all functions transforming relative to absolute names', :require
   it_should_behave_like 'an inclusion function, regardless of the type of class reference,', :require
   it_should_behave_like 'an inclusion function, when --tasks is on,', :require
-
 end

data/spec/unit/functions/shared.rb

@@ -2,19 +2,19 @@ shared_examples_for 'all functions transforming relative to absolute names' do |
   before(:each) do
     # mock that the class 'myclass' exists which are needed for the 'require' functions
     # as it checks the existence of the required class
-    @klass = stub 'class', :name => "myclass"
-    @scope.environment.known_resource_types.stubs(:find_hostclass).returns(@klass)
+    @klass = double('class', :name => "myclass")
+    allow(@scope.environment.known_resource_types).to receive(:find_hostclass).and_return(@klass)
     @resource = Puppet::Parser::Resource.new(:file, "/my/file", :scope => @scope, :source => "source")
-    @scope.stubs(:resource).returns @resource
+    allow(@scope).to receive(:resource).and_return(@resource)
   end
 
   it 'accepts a Class[name] type' do
-    @scope.compiler.expects(:evaluate_classes).with(["::myclass"], @scope, false)
+    expect(@scope.compiler).to receive(:evaluate_classes).with(["::myclass"], @scope, false)
     @scope.call_function(func_name, [Puppet::Pops::Types::TypeFactory.host_class('myclass')])
   end
 
   it 'accepts a Resource[class, name] type' do
-    @scope.compiler.expects(:evaluate_classes).with(["::myclass"], @scope, false)
+    expect(@scope.compiler).to receive(:evaluate_classes).with(["::myclass"], @scope, false)
     @scope.call_function(func_name, [Puppet::Pops::Types::TypeFactory.resource('class', 'myclass')])
   end
 
@@ -45,7 +45,6 @@ shared_examples_for 'all functions transforming relative to absolute names' do |
 end
 
 shared_examples_for 'an inclusion function, regardless of the type of class reference,' do |function|
-
     it "and #{function} a class absolutely, even when a relative namespaced class of the same name is present" do
       catalog = compile_to_catalog(<<-MANIFEST)
         class foo {
@@ -81,7 +80,6 @@ shared_examples_for 'an inclusion function, regardless of the type of class refe
       MANIFEST
       expect(catalog.classes).to include('foo','bar')
     end
-
 end
 
 shared_examples_for 'an inclusion function, when --tasks is on,' do |function|
@@ -94,4 +92,3 @@ shared_examples_for 'an inclusion function, when --tasks is on,' do |function|
     end.to raise_error(Puppet::ParseError, /is only available when compiling a catalog/)
   end
 end
-

data/spec/unit/functions/versioncmp_spec.rb

@@ -3,7 +3,6 @@ require 'puppet/pops'
 require 'puppet/loaders'
 
 describe "the versioncmp function" do
-
   before(:each) do
     loaders = Puppet::Pops::Loaders.new(Puppet::Node::Environment.create(:testing, []))
     Puppet.push_context({:loaders => loaders}, "test-examples")
@@ -28,7 +27,7 @@ describe "the versioncmp function" do
   end
 
   it "should call Puppet::Util::Package.versioncmp (included in scope)" do
-    Puppet::Util::Package.expects(:versioncmp).with('1.2', '1.3').returns(-1)
+    expect(Puppet::Util::Package).to receive(:versioncmp).with('1.2', '1.3').and_return(-1)
 
     expect(versioncmp('1.2', '1.3')).to eq(-1)
   end

data/spec/unit/functions4_spec.rb

@@ -210,12 +210,12 @@ describe 'the 4x function api' do
     end
 
     it 'a function can not be created with parameters declared after a repeated parameter' do
-      expect { create_function_with_param_after_repeated }.to raise_error(ArgumentError, 
+      expect { create_function_with_param_after_repeated }.to raise_error(ArgumentError,
         /function 't1'.*Parameters cannot be added after a repeated parameter/)
     end
 
     it 'a function can not be created with required parameters declared after optional ones' do
-      expect { create_function_with_rq_after_opt }.to raise_error(ArgumentError, 
+      expect { create_function_with_rq_after_opt }.to raise_error(ArgumentError,
         /function 't1'.*A required parameter cannot be added after an optional parameter/)
     end
 
@@ -464,7 +464,7 @@ describe 'the 4x function api' do
           # evaluate a puppet call
           source = "testing::test(10) |$x| { $x+1 }"
           program = parser.parse_string(source, __FILE__)
-          Puppet::Pops::Adapters::LoaderAdapter.expects(:loader_for_model_object).at_least_once.returns(the_loader)
+          expect(Puppet::Pops::Adapters::LoaderAdapter).to receive(:loader_for_model_object).at_least(:once).and_return(the_loader)
           expect(parser.evaluate(scope, program)).to eql(11)
         end
       end
@@ -538,7 +538,7 @@ describe 'the 4x function api' do
         CODE
         the_loader.add_function('testing::test', fc.new({}, the_loader))
         program = parser.parse_string('testing::test(10)', __FILE__)
-        Puppet::Pops::Adapters::LoaderAdapter.expects(:loader_for_model_object).returns(the_loader)
+        expect(Puppet::Pops::Adapters::LoaderAdapter).to receive(:loader_for_model_object).and_return(the_loader)
         expect { parser.evaluate({}, program) }.to raise_error(Puppet::Error,
           /value returned from function 'test' has wrong type, expects a String value, got Integer/)
       end
@@ -560,7 +560,7 @@ describe 'the 4x function api' do
         CODE
         the_loader.add_function('testing::test', fc.new({}, the_loader))
         program = parser.parse_string('testing::test(10)', __FILE__)
-        Puppet::Pops::Adapters::LoaderAdapter.expects(:loader_for_model_object).returns(the_loader)
+        expect(Puppet::Pops::Adapters::LoaderAdapter).to receive(:loader_for_model_object).and_return(the_loader)
         expect(parser.evaluate({}, program)).to eql(10)
       end
 
@@ -579,7 +579,7 @@ describe 'the 4x function api' do
         CODE
         the_loader.add_function('testing::test', fc.new({}, the_loader))
         program = parser.parse_string('testing::test(10)', __FILE__)
-        Puppet::Pops::Adapters::LoaderAdapter.expects(:loader_for_model_object).returns(the_loader)
+        expect(Puppet::Pops::Adapters::LoaderAdapter).to receive(:loader_for_model_object).and_return(the_loader)
         expect { parser.evaluate({}, program) }.to raise_error(Puppet::Error, /parameter 'x' references an unresolved type 'MyAlias'/)
       end
 
@@ -601,7 +601,7 @@ describe 'the 4x function api' do
         CODE
         the_loader.add_function('testing::test', fc.new({}, the_loader))
         program = parser.parse_string('testing::test([10,20])', __FILE__)
-        Puppet::Pops::Adapters::LoaderAdapter.expects(:loader_for_model_object).returns(the_loader)
+        expect(Puppet::Pops::Adapters::LoaderAdapter).to receive(:loader_for_model_object).and_return(the_loader)
         expect(parser.evaluate({}, program)).to eq([10,20])
       end
 
@@ -624,7 +624,7 @@ describe 'the 4x function api' do
         CODE
         the_loader.add_function('testing::test', fc.new({}, the_loader))
         program = parser.parse_string("testing::test({'x' => [10,20]})", __FILE__)
-        Puppet::Pops::Adapters::LoaderAdapter.expects(:loader_for_model_object).returns(the_loader)
+        expect(Puppet::Pops::Adapters::LoaderAdapter).to receive(:loader_for_model_object).and_return(the_loader)
         expect(parser.evaluate({}, program)).to eq({'x' => [10,20]})
       end
 
@@ -646,13 +646,12 @@ describe 'the 4x function api' do
         CODE
         the_loader.add_function('testing::test', fc.new({}, the_loader))
         program = parser.parse_string("testing::test({'x' => {'y' => 'n'}})", __FILE__)
-        Puppet::Pops::Adapters::LoaderAdapter.expects(:loader_for_model_object).returns(the_loader)
+        expect(Puppet::Pops::Adapters::LoaderAdapter).to receive(:loader_for_model_object).and_return(the_loader)
         expect(parser.evaluate({}, program)).to eq({'x' => {'y' => 'n'}})
       end
     end
   end
 
-
   def create_noargs_function_class
     Puppet::Functions.create_function('test') do
       def test()

data/spec/unit/gettext/config_spec.rb

@@ -19,7 +19,7 @@ describe Puppet::GettextConfig do
   end
 
   before(:each) do
-    Puppet::GettextConfig.stubs(:gettext_loaded?).returns true
+    allow(Puppet::GettextConfig).to receive(:gettext_loaded?).and_return(true)
   end
 
   after(:each) do
@@ -29,7 +29,7 @@ describe Puppet::GettextConfig do
 
   describe 'setting and getting the locale' do
     it 'should return "en" when gettext is unavailable' do
-      Puppet::GettextConfig.stubs(:gettext_loaded?).returns(false)
+      allow(Puppet::GettextConfig).to receive(:gettext_loaded?).and_return(false)
 
       expect(Puppet::GettextConfig.current_locale).to eq('en')
     end
@@ -67,7 +67,7 @@ describe Puppet::GettextConfig do
 
     context 'when given a valid locale file location' do
       it 'should return true' do
-        Puppet::GettextConfig.expects(:add_repository_to_domain).with('puppet', local_path, :po, anything)
+        expect(Puppet::GettextConfig).to receive(:add_repository_to_domain).with('puppet', local_path, :po, anything)
 
         expect(Puppet::GettextConfig.load_translations('puppet', local_path, :po)).to be true
       end
@@ -88,7 +88,7 @@ describe Puppet::GettextConfig do
     end
 
     it 'should add puppet translations to the default text domain' do
-      Puppet::GettextConfig.expects(:load_translations).with('puppet', local_path, :po, Puppet::GettextConfig::DEFAULT_TEXT_DOMAIN).returns(true)
+      expect(Puppet::GettextConfig).to receive(:load_translations).with('puppet', local_path, :po, Puppet::GettextConfig::DEFAULT_TEXT_DOMAIN).and_return(true)
 
       Puppet::GettextConfig.create_default_text_domain
       expect(Puppet::GettextConfig.loaded_text_domains).to include(Puppet::GettextConfig::DEFAULT_TEXT_DOMAIN)

data/spec/unit/gettext/module_loading_spec.rb

@@ -16,7 +16,7 @@ describe Puppet::ModuleTranslations do
       :metadata => {
         :author => 'foo'
       },
-      :environment => mock("environment"))
+      :environment => double("environment"))
     }
 
     let(:module_b) { PuppetSpec::Modules.create(
@@ -25,13 +25,13 @@ describe Puppet::ModuleTranslations do
       :metadata => {
         :author => 'foo'
       },
-      :environment => mock("environment"))
+      :environment => double("environment"))
     }
 
     it "should attempt to load translations only for modules that have them" do
-      module_a.expects(:has_translations?).returns(false)
-      module_b.expects(:has_translations?).returns(true)
-      Puppet::GettextConfig.expects(:load_translations).with("foo-mod_b", File.join(modpath, "mod_b", "locales"), :po).returns(true)
+      expect(module_a).to receive(:has_translations?).and_return(false)
+      expect(module_b).to receive(:has_translations?).and_return(true)
+      expect(Puppet::GettextConfig).to receive(:load_translations).with("foo-mod_b", File.join(modpath, "mod_b", "locales"), :po).and_return(true)
 
       Puppet::ModuleTranslations.load_from_modulepath([module_a, module_b])
     end
@@ -44,8 +44,8 @@ describe Puppet::ModuleTranslations do
     }
 
     it "should attempt to load translations for the current locale" do
-      Puppet::GettextConfig.expects(:current_locale).returns("ja")
-      Puppet::GettextConfig.expects(:load_translations).with("foo-mod_a", File.join(vardir, "locales"), :po).returns(true)
+      expect(Puppet::GettextConfig).to receive(:current_locale).and_return("ja")
+      expect(Puppet::GettextConfig).to receive(:load_translations).with("foo-mod_a", File.join(vardir, "locales"), :po).and_return(true)
 
       Puppet::ModuleTranslations.load_from_vardir(vardir)
     end

data/spec/unit/graph/rb_tree_map_spec.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'spec_helper'
 
 require 'puppet/graph'

data/spec/unit/graph/relationship_graph_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/graph'
 
@@ -397,6 +396,6 @@ describe Puppet::Graph::RelationshipGraph do
   end
 
   def stub_vertex(name)
-    stub "vertex #{name}", :ref => name
+    double("vertex #{name}", :ref => name)
   end
 end

data/spec/unit/graph/simple_graph_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/graph'
 
@@ -337,35 +336,35 @@ describe Puppet::Graph::SimpleGraph do
 
     it "should report one-vertex loops" do
       add_edges :a => :a
-      Puppet.expects(:err).with(regexp_matches(/Found 1 dependency cycle:\n\(Notify\[a\] => Notify\[a\]\)/))
+      expect(Puppet).to receive(:err).with(/Found 1 dependency cycle:\n\(Notify\[a\] => Notify\[a\]\)/)
       cycle = @graph.report_cycles_in_graph.first
       expect_cycle_to_include(cycle, :a)
     end
 
     it "should report two-vertex loops" do
       add_edges :a => :b, :b => :a
-      Puppet.expects(:err).with(regexp_matches(/Found 1 dependency cycle:\n\(Notify\[a\] => Notify\[b\] => Notify\[a\]\)/))
+      expect(Puppet).to receive(:err).with(/Found 1 dependency cycle:\n\(Notify\[a\] => Notify\[b\] => Notify\[a\]\)/)
       cycle = @graph.report_cycles_in_graph.first
       expect_cycle_to_include(cycle, :a, :b)
     end
 
     it "should report multi-vertex loops" do
       add_edges :a => :b, :b => :c, :c => :a
-      Puppet.expects(:err).with(regexp_matches(/Found 1 dependency cycle:\n\(Notify\[a\] => Notify\[b\] => Notify\[c\] => Notify\[a\]\)/))
+      expect(Puppet).to receive(:err).with(/Found 1 dependency cycle:\n\(Notify\[a\] => Notify\[b\] => Notify\[c\] => Notify\[a\]\)/)
       cycle = @graph.report_cycles_in_graph.first
       expect_cycle_to_include(cycle, :a, :b, :c)
     end
 
     it "should report when a larger tree contains a small cycle" do
       add_edges :a => :b, :b => :a, :c => :a, :d => :c
-      Puppet.expects(:err).with(regexp_matches(/Found 1 dependency cycle:\n\(Notify\[a\] => Notify\[b\] => Notify\[a\]\)/))
+      expect(Puppet).to receive(:err).with(/Found 1 dependency cycle:\n\(Notify\[a\] => Notify\[b\] => Notify\[a\]\)/)
       cycle = @graph.report_cycles_in_graph.first
       expect_cycle_to_include(cycle, :a, :b)
     end
 
     it "should succeed on trees with no cycles" do
       add_edges :a => :b, :b => :e, :c => :a, :d => :c
-      Puppet.expects(:err).never
+      expect(Puppet).not_to receive(:err)
       expect(@graph.report_cycles_in_graph).to be_nil
     end
 
@@ -469,14 +468,14 @@ describe Puppet::Graph::SimpleGraph do
     end
 
     it "should only write when graphing is enabled" do
-      File.expects(:open).with(@file).never
+      expect(File).not_to receive(:open).with(@file)
       Puppet[:graph] = false
       @graph.write_graph(@name)
     end
 
     it "should write a dot file based on the passed name" do
-      File.expects(:open).with(@file, "w:UTF-8").yields(stub("file", :puts => nil))
-      @graph.expects(:to_dot).with("name" => @name.to_s.capitalize)
+      expect(File).to receive(:open).with(@file, "w:UTF-8").and_yield(double("file", :puts => nil))
+      expect(@graph).to receive(:to_dot).with("name" => @name.to_s.capitalize)
       Puppet[:graph] = true
       @graph.write_graph(@name)
     end
@@ -504,7 +503,7 @@ describe Puppet::Graph::SimpleGraph do
       # because indexing a String with a non-Integer throws an exception (and none of
       # these tests need anything meaningful from []).
       resource = "a"
-      resource.stubs(:[])
+      allow(resource).to receive(:[])
       @event = Puppet::Transaction::Event.new(:name => :yay, :resource => resource)
       @none = Puppet::Transaction::Event.new(:name => :NONE, :resource => resource)
 

data/spec/unit/hiera_puppet_spec.rb

@@ -16,8 +16,8 @@ describe 'HieraPuppet' do
 
     context "when the hiera_config_file exists" do
       before do
-        Hiera::Config.expects(:load).returns(hiera_config_data)
-        HieraPuppet.expects(:hiera_config_file).returns(true)
+        expect(Hiera::Config).to receive(:load).and_return(hiera_config_data)
+        expect(HieraPuppet).to receive(:hiera_config_file).and_return(true)
       end
 
       it "should return a configuration hash" do
@@ -31,8 +31,8 @@ describe 'HieraPuppet' do
 
     context "when the hiera_config_file does not exist" do
       before do
-        Hiera::Config.expects(:load).never
-        HieraPuppet.expects(:hiera_config_file).returns(nil)
+        expect(Hiera::Config).not_to receive(:load)
+        expect(HieraPuppet).to receive(:hiera_config_file).and_return(nil)
       end
 
       it "should return a configuration hash" do
@@ -59,7 +59,7 @@ describe 'HieraPuppet' do
         pending("This example does not apply to Puppet #{Puppet.version} because it does not have this setting")
       end
 
-      Puppet::FileSystem.stubs(:exist?).with(Puppet[:hiera_config]).returns(true)
+      allow(Puppet::FileSystem).to receive(:exist?).with(Puppet[:hiera_config]).and_return(true)
       expect(HieraPuppet.send(:hiera_config_file)).to eq(Puppet[:hiera_config])
     end
 
@@ -75,29 +75,29 @@ describe 'HieraPuppet' do
       end
 
       it "should use Puppet.settings[:codedir]/hiera.yaml when '$codedir/hiera.yaml' exists and '$confdir/hiera.yaml' does not exist" do
-        Puppet::FileSystem.stubs(:exist?).with(code_hiera_config).returns(true)
-        Puppet::FileSystem.stubs(:exist?).with(conf_hiera_config).returns(false)
+        allow(Puppet::FileSystem).to receive(:exist?).with(code_hiera_config).and_return(true)
+        allow(Puppet::FileSystem).to receive(:exist?).with(conf_hiera_config).and_return(false)
 
         expect(HieraPuppet.send(:hiera_config_file)).to eq(code_hiera_config)
       end
 
       it "should use Puppet.settings[:confdir]/hiera.yaml when '$codedir/hiera.yaml' does not exist and '$confdir/hiera.yaml' exists" do
-        Puppet::FileSystem.stubs(:exist?).with(code_hiera_config).returns(false)
-        Puppet::FileSystem.stubs(:exist?).with(conf_hiera_config).returns(true)
+        allow(Puppet::FileSystem).to receive(:exist?).with(code_hiera_config).and_return(false)
+        allow(Puppet::FileSystem).to receive(:exist?).with(conf_hiera_config).and_return(true)
 
         expect(HieraPuppet.send(:hiera_config_file)).to eq(conf_hiera_config)
       end
 
       it "should use Puppet.settings[:codedir]/hiera.yaml when '$codedir/hiera.yaml' exists and '$confdir/hiera.yaml' exists" do
-        Puppet::FileSystem.stubs(:exist?).with(code_hiera_config).returns(true)
-        Puppet::FileSystem.stubs(:exist?).with(conf_hiera_config).returns(true)
+        allow(Puppet::FileSystem).to receive(:exist?).with(code_hiera_config).and_return(true)
+        allow(Puppet::FileSystem).to receive(:exist?).with(conf_hiera_config).and_return(true)
 
         expect(HieraPuppet.send(:hiera_config_file)).to eq(code_hiera_config)
       end
 
       it "should return nil when neither '$codedir/hiera.yaml' nor '$confdir/hiera.yaml' exists" do
-        Puppet::FileSystem.stubs(:exist?).with(code_hiera_config).returns(false)
-        Puppet::FileSystem.stubs(:exist?).with(conf_hiera_config).returns(false)
+        allow(Puppet::FileSystem).to receive(:exist?).with(code_hiera_config).and_return(false)
+        allow(Puppet::FileSystem).to receive(:exist?).with(conf_hiera_config).and_return(false)
 
         expect(HieraPuppet.send(:hiera_config_file)).to eq(nil)
       end
@@ -109,9 +109,9 @@ describe 'HieraPuppet' do
           explicit_hiera_config = '/an/explicit/hiera.yaml'
         end
         Puppet.settings[:hiera_config] = explicit_hiera_config
-        Puppet::FileSystem.stubs(:exist?).with(explicit_hiera_config).returns(true)
-        Puppet::FileSystem.stubs(:exist?).with(code_hiera_config).returns(true)
-        Puppet::FileSystem.stubs(:exist?).with(conf_hiera_config).returns(true)
+        allow(Puppet::FileSystem).to receive(:exist?).with(explicit_hiera_config).and_return(true)
+        allow(Puppet::FileSystem).to receive(:exist?).with(code_hiera_config).and_return(true)
+        allow(Puppet::FileSystem).to receive(:exist?).with(conf_hiera_config).and_return(true)
 
         expect(HieraPuppet.send(:hiera_config_file)).to eq(explicit_hiera_config)
       end
@@ -126,18 +126,18 @@ describe 'HieraPuppet' do
     end
 
     it "should return the value from Hiera" do
-      Hiera.any_instance.stubs(:lookup).returns('8080')
+      allow_any_instance_of(Hiera).to receive(:lookup).and_return('8080')
       expect(HieraPuppet.lookup('port', nil, scope, nil, :priority)).to eq('8080')
 
-      Hiera.any_instance.stubs(:lookup).returns(['foo', 'bar'])
+      allow_any_instance_of(Hiera).to receive(:lookup).and_return(['foo', 'bar'])
       expect(HieraPuppet.lookup('ntpservers', nil, scope, nil, :array)).to eq(['foo', 'bar'])
 
-      Hiera.any_instance.stubs(:lookup).returns({'uid' => '1000'})
+      allow_any_instance_of(Hiera).to receive(:lookup).and_return({'uid' => '1000'})
       expect(HieraPuppet.lookup('user', nil, scope, nil, :hash)).to eq({'uid' => '1000'})
     end
 
     it "should raise a useful error when the answer is nil" do
-      Hiera.any_instance.stubs(:lookup).returns(nil)
+      allow_any_instance_of(Hiera).to receive(:lookup).and_return(nil)
       expect do
         HieraPuppet.lookup('port', nil, scope, nil, :priority)
       end.to raise_error(Puppet::ParseError,