puppet 5.5.12-universal-darwin → 5.5.13-universal-darwin

data/spec/unit/parser/environment_compiler_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/compiler'
 require 'puppet/parser/environment_compiler'
@@ -24,9 +23,12 @@ describe "Application instantiation" do
     Puppet::Parser::EnvironmentCompiler.compile(env, code_id).filter { |r| r.virtual? }
   end
 
-  around :each do |example|
-    Puppet::Parser::Compiler.any_instance.stubs(:loaders).returns(loaders)
-    Puppet::Parser::EnvironmentCompiler.any_instance.stubs(:loaders).returns(loaders)
+  before(:each) do
+    l = loaders
+    allow(Puppet::Pops::Loaders).to receive(:new).and_return(l)
+  end
+
+  around(:each) do |example|
     Puppet.override(:loaders => loaders, :current_environment => env) do
       Puppet::Type.newtype :cap, :is_capability => true do
         newparam :name
@@ -400,14 +402,14 @@ EOS
       }.each do |k,v|
         it "contains the #{v} (#{k})" do
             # Mock the connection to Puppet DB
-            Puppet::Resource::CapabilityFinder.expects(:find).returns(cap)
+            expect(Puppet::Resource::CapabilityFinder).to receive(:find).and_return(cap)
             expect(compiled_catalog.resource(k)).not_to be_nil
         end
       end
 
       it "does not contain the produced resource (Prod[one])" do
         # Mock the connection to Puppet DB
-        Puppet::Resource::CapabilityFinder.expects(:find).returns(cap)
+        expect(Puppet::Resource::CapabilityFinder).to receive(:find).and_return(cap)
         expect(compiled_catalog.resource("Prod[one]")).to be_nil
       end
     end
@@ -448,14 +450,14 @@ EOS
       }.each do |k,v|
         it "contains the #{v} (#{k})" do
           # Mock the connection to Puppet DB
-          Puppet::Resource::CapabilityFinder.expects(:find).returns(cap)
+          expect(Puppet::Resource::CapabilityFinder).to receive(:find).and_return(cap)
           expect(compiled_catalog.resource(k)).not_to be_nil
         end
       end
 
       it "does not contain the produced resource (Class[prod])" do
         # Mock the connection to Puppet DB
-        Puppet::Resource::CapabilityFinder.expects(:find).returns(cap)
+        expect(Puppet::Resource::CapabilityFinder).to receive(:find).and_return(cap)
         expect(compiled_catalog.resource("Class[prod]")).to be_nil
       end
     end
@@ -497,7 +499,7 @@ EOS
     end
 
     it "ignores usage of hiera_include() at topscope for classification" do
-      Puppet.expects(:debug).with(regexp_matches(/Ignoring hiera_include/))
+      expect(Puppet).to receive(:debug).with(/Ignoring hiera_include/)
 
       expect {
         compile_to_env_catalog(<<-EOC).to_resource

data/spec/unit/parser/files_spec.rb

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

data/spec/unit/parser/functions/create_resources_spec.rb

@@ -77,7 +77,7 @@ describe 'function for dynamically creating resources' do
     it 'should pick up and pass on file and line information' do
       # mock location as the compile_to_catalog sets Puppet[:code} which does not
       # have file/line support.
-      Puppet::Pops::PuppetStack.expects(:top_of_stack).once.returns(['test.pp', 1234])
+      expect(Puppet::Pops::PuppetStack).to receive(:top_of_stack).once.and_return(['test.pp', 1234])
       catalog = compile_to_catalog("create_resources('file', {'/etc/foo'=>{'ensure'=>'present'}})")
       r = catalog.resource(:file, "/etc/foo")
       expect(r.file).to eq('test.pp')

data/spec/unit/parser/functions/digest_spec.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env rspec
 require 'spec_helper'
 
 describe "the digest function", :uses_checksums => true do

data/spec/unit/parser/functions/fail_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe "the 'fail' parser function" do
@@ -10,7 +9,7 @@ describe "the 'fail' parser function" do
     node     = Puppet::Node.new('localhost')
     compiler = Puppet::Parser::Compiler.new(node)
     scope    = Puppet::Parser::Scope.new(compiler)
-    scope.stubs(:environment).returns(nil)
+    allow(scope).to receive(:environment).and_return(nil)
     scope
   end
 

data/spec/unit/parser/functions/file_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/files'
 
@@ -35,9 +34,9 @@ describe "the 'file' function" do
 
   it "should read a file from a module path" do
     with_file_content('file content') do |name|
-      mod = mock 'module'
-      mod.stubs(:file).with('myfile').returns(name)
-      compiler.environment.stubs(:module).with('mymod').returns(mod)
+      mod = double('module')
+      allow(mod).to receive(:file).with('myfile').and_return(name)
+      allow(compiler.environment).to receive(:module).with('mymod').and_return(mod)
 
       expect(scope.function_file(['mymod/myfile'])).to eq('file content')
     end
@@ -54,10 +53,10 @@ describe "the 'file' function" do
   it "should return the first file if given two files with module paths" do
     with_file_content('one') do |one|
       with_file_content('two') do |two|
-        mod = mock 'module'
-        compiler.environment.expects(:module).with('mymod').returns(mod)
-        mod.expects(:file).with('one').returns(one)
-        mod.stubs(:file).with('two').returns(two)
+        mod = double('module')
+        expect(compiler.environment).to receive(:module).with('mymod').and_return(mod)
+        expect(mod).to receive(:file).with('one').and_return(one)
+        allow(mod).to receive(:file).with('two').and_return(two)
 
         expect(scope.function_file(['mymod/one','mymod/two'])).to eq('one')
       end
@@ -67,9 +66,9 @@ describe "the 'file' function" do
   it "should return the first file if given two files with mixed paths, absolute first" do
     with_file_content('one') do |one|
       with_file_content('two') do |two|
-        mod = mock 'module'
-        compiler.environment.stubs(:module).with('mymod').returns(mod)
-        mod.stubs(:file).with('two').returns(two)
+        mod = double('module')
+        allow(compiler.environment).to receive(:module).with('mymod').and_return(mod)
+        allow(mod).to receive(:file).with('two').and_return(two)
 
         expect(scope.function_file([one,'mymod/two'])).to eq('one')
       end
@@ -79,9 +78,9 @@ describe "the 'file' function" do
   it "should return the first file if given two files with mixed paths, module first" do
     with_file_content('one') do |one|
       with_file_content('two') do |two|
-        mod = mock 'module'
-        compiler.environment.expects(:module).with('mymod').returns(mod)
-        mod.stubs(:file).with('two').returns(two)
+        mod = double('module')
+        expect(compiler.environment).to receive(:module).with('mymod').and_return(mod)
+        allow(mod).to receive(:file).with('two').and_return(two)
 
         expect(scope.function_file(['mymod/two',one])).to eq('two')
       end

data/spec/unit/parser/functions/fqdn_rand_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/scope'
 
@@ -39,25 +38,25 @@ describe "the fqdn_rand function" do
   end
 
   it "should return a specific value with given set of inputs on non-fips enabled host" do
-    Puppet::Util::Platform.stubs(:fips_enabled?).returns false
+    allow(Puppet::Util::Platform).to receive(:fips_enabled?).and_return(false)
 
     expect(fqdn_rand(3000, :host => 'dummy.fqdn.net')).to eql(338)
   end
 
   it "should return a specific value with given set of inputs on fips enabled host" do
-    Puppet::Util::Platform.stubs(:fips_enabled?).returns true
+    allow(Puppet::Util::Platform).to receive(:fips_enabled?).and_return(true)
 
     expect(fqdn_rand(3000, :host => 'dummy.fqdn.net')).to eql(278)
   end
 
   it "should return a specific value with given seed on a non-fips enabled host" do
-    Puppet::Util::Platform.stubs(:fips_enabled?).returns false
+    allow(Puppet::Util::Platform).to receive(:fips_enabled?).and_return(false)
 
     expect(fqdn_rand(5000, :extra_identifier => ['expensive job 33'])).to eql(3374)
   end
 
   it "should return a specific value with given seed on a fips enabled host" do
-    Puppet::Util::Platform.stubs(:fips_enabled?).returns true
+    allow(Puppet::Util::Platform).to receive(:fips_enabled?).and_return(true)
 
     expect(fqdn_rand(5000, :extra_identifier => ['expensive job 33'])).to eql(2389)
   end
@@ -67,7 +66,7 @@ describe "the fqdn_rand function" do
     extra = args[:extra_identifier] || []
 
     scope = create_test_scope_for_node('localhost')
-    scope.stubs(:[]).with("::fqdn").returns(host)
+    allow(scope).to receive(:[]).with("::fqdn").and_return(host)
 
     scope.function_fqdn_rand([max] + extra)
   end

data/spec/unit/parser/functions/generate_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe "the generate function" do
@@ -18,7 +17,7 @@ describe "the generate function" do
 
   it "accept a fully-qualified path as a command" do
     command = File.expand_path('/command/foo')
-    Dir.expects(:chdir).with(File.dirname(command)).returns("yay")
+    expect(Dir).to receive(:chdir).with(File.dirname(command)).and_return("yay")
     expect(scope.function_generate([command])).to eq("yay")
   end
 
@@ -41,32 +40,32 @@ describe "the generate function" do
 
   it "should execute the generate script with the correct working directory" do
     command = File.expand_path("/command")
-    Dir.expects(:chdir).with(File.dirname(command)).returns("yay")
+    expect(Dir).to receive(:chdir).with(File.dirname(command)).and_return("yay")
     expect(scope.function_generate([command])).to eq('yay')
   end
 
   describe "on Windows", :if => Puppet.features.microsoft_windows? do
     it "should accept the tilde in the path" do
       command = "C:/DOCUME~1/ADMINI~1/foo.bat"
-      Dir.expects(:chdir).with(File.dirname(command)).returns("yay")
+      expect(Dir).to receive(:chdir).with(File.dirname(command)).and_return("yay")
       expect(scope.function_generate([command])).to eq('yay')
     end
 
     it "should accept lower-case drive letters" do
       command = 'd:/command/foo'
-      Dir.expects(:chdir).with(File.dirname(command)).returns("yay")
+      expect(Dir).to receive(:chdir).with(File.dirname(command)).and_return("yay")
       expect(scope.function_generate([command])).to eq('yay')
     end
 
     it "should accept upper-case drive letters" do
       command = 'D:/command/foo'
-      Dir.expects(:chdir).with(File.dirname(command)).returns("yay")
+      expect(Dir).to receive(:chdir).with(File.dirname(command)).and_return("yay")
       expect(scope.function_generate([command])).to eq('yay')
     end
 
     it "should accept forward and backslashes in the path" do
       command = 'D:\command/foo\bar'
-      Dir.expects(:chdir).with(File.dirname(command)).returns("yay")
+      expect(Dir).to receive(:chdir).with(File.dirname(command)).and_return("yay")
       expect(scope.function_generate([command])).to eq('yay')
     end
 
@@ -86,7 +85,7 @@ describe "the generate function" do
 
     it "should accept plus and dash" do
       command = "/var/folders/9z/9zXImgchH8CZJh6SgiqS2U+++TM/-Tmp-/foo"
-      Dir.expects(:chdir).with(File.dirname(command)).returns("yay")
+      expect(Dir).to receive(:chdir).with(File.dirname(command)).and_return("yay")
       expect(scope.function_generate([command])).to eq('yay')
     end
   end

data/spec/unit/parser/functions/inline_template_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe "the inline_template function" do

data/spec/unit/parser/functions/regsubst_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe "the regsubst function" do

data/spec/unit/parser/functions/scanf_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe "the scanf function" do

data/spec/unit/parser/functions/shellquote_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe "the shellquote function" do

data/spec/unit/parser/functions/split_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe "the split function" do

data/spec/unit/parser/functions/sprintf_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe "the sprintf function" do

data/spec/unit/parser/functions/tag_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe "the 'tag' function" do
@@ -18,7 +17,7 @@ describe "the 'tag' function" do
 
   it "should tag the resource with any provided tags" do
     resource = Puppet::Parser::Resource.new(:file, "/file", :scope => @scope)
-    @scope.expects(:resource).returns resource
+    expect(@scope).to receive(:resource).and_return(resource)
 
     @scope.function_tag ["one", "two"]
 

data/spec/unit/parser/functions/tagged_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe "the 'tagged' function" do
@@ -25,7 +24,7 @@ describe "the 'tagged' function" do
 
   it 'should be case-insensitive' do
     resource = Puppet::Parser::Resource.new(:file, "/file", :scope => @scope)
-    @scope.stubs(:resource).returns resource
+    allow(@scope).to receive(:resource).and_return(resource)
     @scope.function_tag ["one"]
 
     expect(@scope.function_tagged(['One'])).to eq(true)
@@ -33,7 +32,7 @@ describe "the 'tagged' function" do
 
   it 'should check if all specified tags are included' do
     resource = Puppet::Parser::Resource.new(:file, "/file", :scope => @scope)
-    @scope.stubs(:resource).returns resource
+    allow(@scope).to receive(:resource).and_return(resource)
     @scope.function_tag ["one"]
 
     expect(@scope.function_tagged(['one', 'two'])).to eq(false)

data/spec/unit/parser/functions/template_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe "the template function" do
@@ -11,21 +10,22 @@ describe "the template function" do
   let :scope    do Puppet::Parser::Scope.new(compiler) end
 
   it "concatenates outputs for multiple templates" do
-    tw1 = stub_everything "template_wrapper1"
-    tw2 = stub_everything "template_wrapper2"
-    Puppet::Parser::TemplateWrapper.stubs(:new).returns(tw1,tw2)
-    tw1.stubs(:file=).with("1")
-    tw2.stubs(:file=).with("2")
-    tw1.stubs(:result).returns("result1")
-    tw2.stubs(:result).returns("result2")
+    tw1 = double("template_wrapper1")
+    tw2 = double("template_wrapper2")
+    allow(Puppet::Parser::TemplateWrapper).to receive(:new).and_return(tw1,tw2)
+    allow(tw1).to receive(:file=).with("1")
+    allow(tw2).to receive(:file=).with("2")
+    allow(tw1).to receive(:result).and_return("result1")
+    allow(tw2).to receive(:result).and_return("result2")
 
     expect(scope.function_template(["1","2"])).to eq("result1result2")
   end
 
   it "raises an error if the template raises an error" do
-    tw = stub_everything 'template_wrapper'
-    Puppet::Parser::TemplateWrapper.stubs(:new).returns(tw)
-    tw.stubs(:result).raises
+    tw = double('template_wrapper')
+    allow(tw).to receive(:file=).with("1")
+    allow(Puppet::Parser::TemplateWrapper).to receive(:new).and_return(tw)
+    allow(tw).to receive(:result).and_raise
 
     expect {
       scope.function_template(["1"])
@@ -90,8 +90,8 @@ describe "the template function" do
   end
 
   def eval_template(content)
-    Puppet::FileSystem.stubs(:read_preserve_line_endings).with("template").returns(content)
-    Puppet::Parser::Files.stubs(:find_template).returns("template")
+    allow(Puppet::FileSystem).to receive(:read_preserve_line_endings).with("template").and_return(content)
+    allow(Puppet::Parser::Files).to receive(:find_template).and_return("template")
     scope.function_template(['template'])
   end
 end

data/spec/unit/parser/functions/versioncmp_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe "the versioncmp function" do
@@ -25,7 +24,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)
 
     @scope.function_versioncmp(["1.2", "1.3"])
   end

data/spec/unit/parser/functions_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe Puppet::Parser::Functions do
@@ -27,7 +26,7 @@ describe Puppet::Parser::Functions do
 
     it "should warn if the function already exists" do
       Puppet::Parser::Functions.newfunction("name", :type => :rvalue) { |args| }
-      Puppet.expects(:warning)
+      expect(Puppet).to receive(:warning)
 
       Puppet::Parser::Functions.newfunction("name", :type => :rvalue) { |args| }
     end
@@ -49,7 +48,7 @@ describe Puppet::Parser::Functions do
 
   describe "when calling function to test function existence" do
     it "should return false if the function doesn't exist" do
-      Puppet::Parser::Functions.autoloader.stubs(:load)
+      allow(Puppet::Parser::Functions.autoloader).to receive(:load)
 
       expect(Puppet::Parser::Functions.function("name")).to be_falsey
     end
@@ -61,7 +60,7 @@ describe Puppet::Parser::Functions do
     end
 
     it "should try to autoload the function if it doesn't exist yet" do
-      Puppet::Parser::Functions.autoloader.expects(:load)
+      expect(Puppet::Parser::Functions.autoloader).to receive(:load)
 
       Puppet::Parser::Functions.function("name")
     end

data/spec/unit/parser/relationship_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/parser/relationship'

data/spec/unit/parser/resource_spec.rb

@@ -49,24 +49,24 @@ describe Puppet::Parser::Resource do
   end
 
   it "should get its environment from its scope" do
-    scope = stub 'scope', :source => stub("source")
-    scope.expects(:environment).returns("foo").at_least_once
-    scope.expects(:lookupdefaults).returns({})
+    scope = double('scope', :source => double("source"))
+    expect(scope).to receive(:environment).and_return("foo").at_least(:once)
+    expect(scope).to receive(:lookupdefaults).and_return({})
     expect(Puppet::Parser::Resource.new("file", "whatever", :scope => scope).environment).to eq("foo")
   end
 
   it "should use the scope's environment as its environment" do
-    @scope.expects(:environment).returns("myenv").at_least_once
+    expect(@scope).to receive(:environment).and_return("myenv").at_least(:once)
     expect(Puppet::Parser::Resource.new("file", "whatever", :scope => @scope).environment).to eq("myenv")
   end
 
   it "should be isomorphic if it is builtin and models an isomorphic type" do
-    Puppet::Type.type(:file).expects(:isomorphic?).returns(true)
+    expect(Puppet::Type.type(:file)).to receive(:isomorphic?).and_return(true)
     @resource = expect(Puppet::Parser::Resource.new("file", "whatever", :scope => @scope, :source => @source).isomorphic?).to be_truthy
   end
 
   it "should not be isomorphic if it is builtin and models a non-isomorphic type" do
-    Puppet::Type.type(:file).expects(:isomorphic?).returns(false)
+    expect(Puppet::Type.type(:file)).to receive(:isomorphic?).and_return(false)
     @resource = expect(Puppet::Parser::Resource.new("file", "whatever", :scope => @scope, :source => @source).isomorphic?).to be_falsey
   end
 
@@ -81,9 +81,9 @@ describe Puppet::Parser::Resource do
   end
 
   it "should use a Puppet::Resource for converting to a ral resource" do
-    trans = mock 'resource', :to_ral => "yay"
+    trans = double('resource', :to_ral => "yay")
     @resource = mkresource
-    @resource.expects(:copy_as_resource).returns trans
+    expect(@resource).to receive(:copy_as_resource).and_return(trans)
     expect(@resource.to_ral).to eq("yay")
   end
 
@@ -125,8 +125,8 @@ describe Puppet::Parser::Resource do
   describe "when evaluating" do
     before do
       @catalog = Puppet::Resource::Catalog.new
-      source = stub('source')
-      source.stubs(:module_name)
+      source = double('source')
+      allow(source).to receive(:module_name)
       @scope = Puppet::Parser::Scope.new(@compiler, :source => source)
       @catalog.add_resource(Puppet::Parser::Resource.new("stage", :main, :scope => @scope))
     end
@@ -134,7 +134,7 @@ describe Puppet::Parser::Resource do
     it "should evaluate the associated AST definition" do
       definition = newdefine "mydefine"
       res = Puppet::Parser::Resource.new("mydefine", "whatever", :scope => @scope, :source => @source, :catalog => @catalog)
-      definition.expects(:evaluate_code).with(res)
+      expect(definition).to receive(:evaluate_code).with(res)
 
       res.evaluate
     end
@@ -142,14 +142,14 @@ describe Puppet::Parser::Resource do
     it "should evaluate the associated AST class" do
       @class = newclass "myclass"
       res = Puppet::Parser::Resource.new("class", "myclass", :scope => @scope, :source => @source, :catalog => @catalog)
-      @class.expects(:evaluate_code).with(res)
+      expect(@class).to receive(:evaluate_code).with(res)
       res.evaluate
     end
 
     it "should evaluate the associated AST node" do
       nodedef = newnode("mynode")
       res = Puppet::Parser::Resource.new("node", "mynode", :scope => @scope, :source => @source, :catalog => @catalog)
-      nodedef.expects(:evaluate_code).with(res)
+      expect(nodedef).to receive(:evaluate_code).with(res)
       res.evaluate
     end
 
@@ -314,19 +314,19 @@ describe Puppet::Parser::Resource do
     let(:resource) { Puppet::Parser::Resource.new('file', 'whatever', :scope => @scope, :source => @source) }
 
     it 'should add all defaults available from the scope' do
-      @scope.expects(:lookupdefaults).with('File').returns(:owner => param(:owner, 'default', @source))
+      expect(@scope).to receive(:lookupdefaults).with('File').and_return(:owner => param(:owner, 'default', @source))
 
       expect(resource[:owner]).to eq('default')
     end
 
     it 'should not replace existing parameters with defaults' do
-      @scope.expects(:lookupdefaults).with('File').returns(:owner => param(:owner, 'replaced', @source))
+      expect(@scope).to receive(:lookupdefaults).with('File').and_return(:owner => param(:owner, 'replaced', @source))
       r = Puppet::Parser::Resource.new('file', 'whatever', :scope => @scope, :source => @source, :parameters => [ param(:owner, 'oldvalue', @source) ])
       expect(r[:owner]).to eq('oldvalue')
     end
 
     it 'should override defaults with new parameters' do
-      @scope.expects(:lookupdefaults).with('File').returns(:owner => param(:owner, 'replaced', @source))
+      expect(@scope).to receive(:lookupdefaults).with('File').and_return(:owner => param(:owner, 'replaced', @source))
 
       resource.set_parameter(:owner, 'newvalue')
       expect(resource[:owner]).to eq('newvalue')
@@ -336,14 +336,14 @@ describe Puppet::Parser::Resource do
       newparam = param(:owner, 'default', @source)
       other = newparam.dup
       other.value = "other"
-      newparam.expects(:dup).returns(other)
-      @scope.expects(:lookupdefaults).with('File').returns(:owner => newparam)
+      expect(newparam).to receive(:dup).and_return(other)
+      expect(@scope).to receive(:lookupdefaults).with('File').and_return(:owner => newparam)
 
       expect(resource[:owner]).to eq('other')
     end
 
     it "should tag with value of default parameter named 'tag'" do
-      @scope.expects(:lookupdefaults).with('File').returns(:tag => param(:tag, 'the_tag', @source))
+      expect(@scope).to receive(:lookupdefaults).with('File').and_return(:tag => param(:tag, 'the_tag', @source))
 
       expect(resource.tags).to include('the_tag')
     end
@@ -356,7 +356,7 @@ describe Puppet::Parser::Resource do
 
     it "should do nothing if it has already been finished" do
       @resource.finish
-      @resource.expects(:add_scope_tags).never
+      expect(@resource).not_to receive(:add_scope_tags)
       @resource.finish
     end
 
@@ -370,9 +370,9 @@ describe Puppet::Parser::Resource do
 
   describe "when being tagged" do
     before do
-      @scope_resource = stub 'scope_resource', :tags => %w{srone srtwo}
-      @scope.stubs(:resource).returns @scope_resource
-      @resource = Puppet::Parser::Resource.new("file", "yay", :scope => @scope, :source => mock('source'))
+      @scope_resource = double('scope_resource', :tags => %w{srone srtwo})
+      allow(@scope).to receive(:resource).and_return(@scope_resource)
+      @resource = Puppet::Parser::Resource.new("file", "yay", :scope => @scope, :source => double('source'))
     end
 
     it "should get tagged with the resource type" do
@@ -384,19 +384,19 @@ describe Puppet::Parser::Resource do
     end
 
     it "should get tagged with each name in the title if the title is a qualified class name" do
-      resource = Puppet::Parser::Resource.new("file", "one::two", :scope => @scope, :source => mock('source'))
+      resource = Puppet::Parser::Resource.new("file", "one::two", :scope => @scope, :source => double('source'))
       expect(resource.tags).to be_include("one")
       expect(resource.tags).to be_include("two")
     end
 
     it "should get tagged with each name in the type if the type is a qualified class name" do
-      resource = Puppet::Parser::Resource.new("one::two", "whatever", :scope => @scope, :source => mock('source'))
+      resource = Puppet::Parser::Resource.new("one::two", "whatever", :scope => @scope, :source => double('source'))
       expect(resource.tags).to be_include("one")
       expect(resource.tags).to be_include("two")
     end
 
     it "should not get tagged with non-alphanumeric titles" do
-      resource = Puppet::Parser::Resource.new("file", "this is a test", :scope => @scope, :source => mock('source'))
+      resource = Puppet::Parser::Resource.new("file", "this is a test", :scope => @scope, :source => double('source'))
       expect(resource.tags).not_to be_include("this is a test")
     end
 
@@ -426,34 +426,34 @@ describe Puppet::Parser::Resource do
 
     it "should fail when the override was not created by a parent class" do
       @override.source = "source2"
-      @override.source.expects(:child_of?).with("source1").returns(false)
+      expect(@override.source).to receive(:child_of?).with("source1").and_return(false)
       expect { @resource.merge(@override) }.to raise_error(Puppet::ParseError)
     end
 
     it "should succeed when the override was created in the current scope" do
       @resource.source = "source3"
       @override.source = @resource.source
-      @override.source.expects(:child_of?).with("source3").never
+      expect(@override.source).not_to receive(:child_of?).with("source3")
       params = {:a => :b, :c => :d}
-      @override.expects(:parameters).returns(params)
-      @resource.expects(:override_parameter).with(:b)
-      @resource.expects(:override_parameter).with(:d)
+      expect(@override).to receive(:parameters).and_return(params)
+      expect(@resource).to receive(:override_parameter).with(:b)
+      expect(@resource).to receive(:override_parameter).with(:d)
       @resource.merge(@override)
     end
 
     it "should succeed when a parent class created the override" do
       @resource.source = "source3"
       @override.source = "source4"
-      @override.source.expects(:child_of?).with("source3").returns(true)
+      expect(@override.source).to receive(:child_of?).with("source3").and_return(true)
       params = {:a => :b, :c => :d}
-      @override.expects(:parameters).returns(params)
-      @resource.expects(:override_parameter).with(:b)
-      @resource.expects(:override_parameter).with(:d)
+      expect(@override).to receive(:parameters).and_return(params)
+      expect(@resource).to receive(:override_parameter).with(:b)
+      expect(@resource).to receive(:override_parameter).with(:d)
       @resource.merge(@override)
     end
 
     it "should add new parameters when the parameter is not set" do
-      @source.stubs(:child_of?).returns true
+      allow(@source).to receive(:child_of?).and_return(true)
       @override.set_parameter(:testing, "value")
       @resource.merge(@override)
 
@@ -461,7 +461,7 @@ describe Puppet::Parser::Resource do
     end
 
     it "should replace existing parameter values" do
-      @source.stubs(:child_of?).returns true
+      allow(@source).to receive(:child_of?).and_return(true)
       @resource.set_parameter(:testing, "old")
       @override.set_parameter(:testing, "value")
 
@@ -471,7 +471,7 @@ describe Puppet::Parser::Resource do
     end
 
     it "should add values to the parameter when the override was created with the '+>' syntax" do
-      @source.stubs(:child_of?).returns true
+      allow(@source).to receive(:child_of?).and_return(true)
       param = Puppet::Parser::Resource::Param.new(:name => :testing, :value => "testing", :source => @resource.source)
       param.add = true
 
@@ -490,7 +490,7 @@ describe Puppet::Parser::Resource do
       @resource.  set_parameter(:testing, "old_val_1")
       @resource_2.set_parameter(:testing, "old_val_2")
 
-      @source.stubs(:child_of?).returns true
+      allow(@source).to receive(:child_of?).and_return(true)
       param = Puppet::Parser::Resource::Param.new(:name => :testing, :value => "new_val", :source => @resource.source)
       param.add = true
       @override.set_parameter(param)
@@ -503,7 +503,7 @@ describe Puppet::Parser::Resource do
     end
 
     it "should promote tag overrides to real tags" do
-      @source.stubs(:child_of?).returns true
+      allow(@source).to receive(:child_of?).and_return(true)
       param = Puppet::Parser::Resource::Param.new(:name => :tag, :value => "testing", :source => @resource.source)
 
       @override.set_parameter(param)
@@ -516,7 +516,7 @@ describe Puppet::Parser::Resource do
   end
 
   it "should be able to be converted to a normal resource" do
-    @source = stub 'scope', :name => "myscope"
+    @source = double('scope', :name => "myscope")
     @resource = mkresource :source => @source
     expect(@resource).to respond_to(:copy_as_resource)
   end
@@ -634,7 +634,7 @@ describe Puppet::Parser::Resource do
 
   # part of #629 -- the undef keyword.  Make sure 'undef' params get skipped.
   it "should not include 'undef' parameters when converting itself to a hash" do
-    resource = Puppet::Parser::Resource.new "file", "/tmp/testing", :source => mock("source"), :scope => @scope
+    resource = Puppet::Parser::Resource.new "file", "/tmp/testing", :source => double("source"), :scope => @scope
     resource[:owner] = :undef
     resource[:mode] = "755"
     expect(resource.to_hash[:owner]).to be_nil