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

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'
@@ -25,8 +24,8 @@ describe "Application instantiation" do
   end
 
   before(:each) do
-    Puppet::Parser::Compiler.any_instance.stubs(:loaders).returns(loaders)
-    Puppet::Parser::EnvironmentCompiler.any_instance.stubs(:loaders).returns(loaders)
+    allow_any_instance_of(Puppet::Parser::Compiler).to receive(:loaders).and_return(loaders)
+    allow_any_instance_of(Puppet::Parser::EnvironmentCompiler).to receive(:loaders).and_return(loaders)
     Puppet.push_context({:loaders => loaders, :current_environment => env})
     Puppet::Type.newtype :cap, :is_capability => true do
       newparam :name
@@ -402,14 +401,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
@@ -450,14 +449,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
@@ -499,7 +498,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 ruby
 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
@@ -6,7 +5,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'
 
@@ -31,9 +30,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
@@ -50,10 +49,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
@@ -63,9 +62,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
@@ -75,9 +74,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
@@ -14,7 +13,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
 
@@ -37,32 +36,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::Util::Platform.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
 
@@ -82,7 +81,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
@@ -14,7 +13,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
@@ -21,7 +20,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)
@@ -29,7 +28,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
@@ -7,21 +6,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"])
@@ -86,8 +86,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
@@ -21,7 +20,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
@@ -53,28 +52,28 @@ describe Puppet::Parser::Functions do
     end
 
     it "emits a deprecation warning when loading all 3.x functions" do
-      Puppet::Parser::Functions.autoloader.delegatee.stubs(:loadall)
+      allow(Puppet::Parser::Functions.autoloader.delegatee).to receive(:loadall)
       Puppet::Parser::Functions.autoloader.loadall
 
       expect(@logs.map(&:to_s)).to include(/The method 'Puppet::Parser::Functions.autoloader#loadall' is deprecated in favor of using 'Scope#call_function/)
     end
 
     it "emits a deprecation warning when loading a single 3.x function" do
-      Puppet::Parser::Functions.autoloader.delegatee.stubs(:load)
+      allow(Puppet::Parser::Functions.autoloader.delegatee).to receive(:load)
       Puppet::Parser::Functions.autoloader.load('beatles')
 
       expect(@logs.map(&:to_s)).to include(/The method 'Puppet::Parser::Functions.autoloader#load\("beatles"\)' is deprecated in favor of using 'Scope#call_function'/)
     end
 
     it "emits a deprecation warning when checking if a 3x function is loaded" do
-      Puppet::Parser::Functions.autoloader.delegatee.stubs(:loaded?).returns(false)
+      allow(Puppet::Parser::Functions.autoloader.delegatee).to receive(:loaded?).and_return(false)
       Puppet::Parser::Functions.autoloader.loaded?('beatles')
 
       expect(@logs.map(&:to_s)).to include(/The method 'Puppet::Parser::Functions.autoloader#loaded\?\(\"beatles\"\)' is deprecated in favor of using 'Scope#call_function'/)
     end
 
     it "should return false if the function doesn't exist" do
-      Puppet::Parser::Functions.autoloader.delegatee.stubs(:load)
+      allow(Puppet::Parser::Functions.autoloader.delegatee).to receive(:load)
 
       expect(Puppet::Parser::Functions.function("name")).to be_falsey
     end
@@ -86,7 +85,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.delegatee.expects(:load)
+      expect(Puppet::Parser::Functions.autoloader.delegatee).to receive(:load)
 
       Puppet::Parser::Functions.function("name")
     end