puppet 5.5.22-x86-mingw32 → 6.0.0-x86-mingw32

data/spec/unit/parser/environment_compiler_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/compiler'
 require 'puppet/parser/environment_compiler'
@@ -24,19 +25,18 @@ describe "Application instantiation" do
   end
 
   before(:each) do
-    l = loaders
-    allow(Puppet::Pops::Loaders).to receive(:new).and_return(l)
+    Puppet::Parser::Compiler.any_instance.stubs(:loaders).returns(loaders)
+    Puppet::Parser::EnvironmentCompiler.any_instance.stubs(:loaders).returns(loaders)
+    Puppet.push_context({:loaders => loaders, :current_environment => env})
+    Puppet::Type.newtype :cap, :is_capability => true do
+      newparam :name
+      newparam :host
+    end
   end
 
-  around(:each) do |example|
-    Puppet.override(:loaders => loaders, :current_environment => env) do
-      Puppet::Type.newtype :cap, :is_capability => true do
-        newparam :name
-        newparam :host
-      end
-      example.run
-      Puppet::Type.rmtype(:cap)
-    end
+  after(:each) do
+    Puppet::Type.rmtype(:cap)
+    Puppet.pop_context()
   end
 
   MANIFEST = <<-EOS
@@ -367,13 +367,6 @@ EOS
       }.to raise_error(/'Cap\[cap\]' is exported by both 'Prod\[one\]' and 'Prod\[two\]'/)
     end
 
-    it "issues deprecation warnings" do
-      expect {compile_collect_log(MANIFEST_WO_NODE)}.not_to raise_error
-      expect(warnings).to include(/Capability Mapping is deprecated/) # there are two of these
-      expect(warnings).to include(/Application is deprecated/)
-      expect(warnings).to include(/Site Definition is deprecated/)
-    end
-
     context "for producing node" do
       let(:compiled_node) { Puppet::Node.new('first', :environment => env) }
       let(:compiled_catalog) { compile_to_catalog(MANIFEST, compiled_node)}
@@ -409,14 +402,14 @@ EOS
       }.each do |k,v|
         it "contains the #{v} (#{k})" do
             # Mock the connection to Puppet DB
-            expect(Puppet::Resource::CapabilityFinder).to receive(:find).and_return(cap)
+            Puppet::Resource::CapabilityFinder.expects(:find).returns(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
-        expect(Puppet::Resource::CapabilityFinder).to receive(:find).and_return(cap)
+        Puppet::Resource::CapabilityFinder.expects(:find).returns(cap)
         expect(compiled_catalog.resource("Prod[one]")).to be_nil
       end
     end
@@ -457,14 +450,14 @@ EOS
       }.each do |k,v|
         it "contains the #{v} (#{k})" do
           # Mock the connection to Puppet DB
-          expect(Puppet::Resource::CapabilityFinder).to receive(:find).and_return(cap)
+          Puppet::Resource::CapabilityFinder.expects(:find).returns(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
-        expect(Puppet::Resource::CapabilityFinder).to receive(:find).and_return(cap)
+        Puppet::Resource::CapabilityFinder.expects(:find).returns(cap)
         expect(compiled_catalog.resource("Class[prod]")).to be_nil
       end
     end
@@ -506,7 +499,7 @@ EOS
     end
 
     it "ignores usage of hiera_include() at topscope for classification" do
-      expect(Puppet).to receive(:debug).with(/Ignoring hiera_include/)
+      Puppet.expects(:debug).with(regexp_matches(/Ignoring hiera_include/))
 
       expect {
         compile_to_env_catalog(<<-EOC).to_resource

data/spec/unit/parser/files_spec.rb

@@ -1,3 +1,4 @@
+#! /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.
-      expect(Puppet::Pops::PuppetStack).to receive(:top_of_stack).once.and_return(['test.pp', 1234])
+      Puppet::Pops::PuppetStack.expects(:top_of_stack).once.returns(['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,10 +1,7 @@
+#!/usr/bin/env ruby
 require 'spec_helper'
 
 describe "the digest function", :uses_checksums => true do
-  before :all do
-    Puppet::Parser::Functions.autoloader.loadall
-  end
-
   before :each do
     n = Puppet::Node.new('unnamed')
     c = Puppet::Parser::Compiler.new(n)

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

@@ -1,15 +1,12 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe "the 'fail' parser function" do
-  before :all do
-    Puppet::Parser::Functions.autoloader.loadall
-  end
-
   let :scope do
     node     = Puppet::Node.new('localhost')
     compiler = Puppet::Parser::Compiler.new(node)
     scope    = Puppet::Parser::Scope.new(compiler)
-    allow(scope).to receive(:environment).and_return(nil)
+    scope.stubs(:environment).returns(nil)
     scope
   end
 

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

@@ -1,13 +1,10 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/files'
 
 describe "the 'file' function" do
   include PuppetSpec::Files
 
-  before :all do
-    Puppet::Parser::Functions.autoloader.loadall
-  end
-
   let :node     do Puppet::Node.new('localhost') end
   let :compiler do Puppet::Parser::Compiler.new(node) end
   let :scope    do Puppet::Parser::Scope.new(compiler) end
@@ -34,9 +31,9 @@ describe "the 'file' function" do
 
   it "should read a file from a module path" do
     with_file_content('file content') do |name|
-      mod = double('module')
-      allow(mod).to receive(:file).with('myfile').and_return(name)
-      allow(compiler.environment).to receive(:module).with('mymod').and_return(mod)
+      mod = mock 'module'
+      mod.stubs(:file).with('myfile').returns(name)
+      compiler.environment.stubs(:module).with('mymod').returns(mod)
 
       expect(scope.function_file(['mymod/myfile'])).to eq('file content')
     end
@@ -53,10 +50,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 = 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)
+        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)
 
         expect(scope.function_file(['mymod/one','mymod/two'])).to eq('one')
       end
@@ -66,9 +63,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 = double('module')
-        allow(compiler.environment).to receive(:module).with('mymod').and_return(mod)
-        allow(mod).to receive(:file).with('two').and_return(two)
+        mod = mock 'module'
+        compiler.environment.stubs(:module).with('mymod').returns(mod)
+        mod.stubs(:file).with('two').returns(two)
 
         expect(scope.function_file([one,'mymod/two'])).to eq('one')
       end
@@ -78,9 +75,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 = double('module')
-        expect(compiler.environment).to receive(:module).with('mymod').and_return(mod)
-        allow(mod).to receive(:file).with('two').and_return(two)
+        mod = mock 'module'
+        compiler.environment.expects(:module).with('mymod').returns(mod)
+        mod.stubs(:file).with('two').returns(two)
 
         expect(scope.function_file(['mymod/two',one])).to eq('two')
       end

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

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/scope'
 
@@ -38,25 +39,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
-    allow(Puppet::Util::Platform).to receive(:fips_enabled?).and_return(false)
+    Puppet::Util::Platform.stubs(:fips_enabled?).returns 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
-    allow(Puppet::Util::Platform).to receive(:fips_enabled?).and_return(true)
+    Puppet::Util::Platform.stubs(:fips_enabled?).returns 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
-    allow(Puppet::Util::Platform).to receive(:fips_enabled?).and_return(false)
+    Puppet::Util::Platform.stubs(:fips_enabled?).returns 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
-    allow(Puppet::Util::Platform).to receive(:fips_enabled?).and_return(true)
+    Puppet::Util::Platform.stubs(:fips_enabled?).returns true
 
     expect(fqdn_rand(5000, :extra_identifier => ['expensive job 33'])).to eql(2389)
   end
@@ -66,7 +67,7 @@ describe "the fqdn_rand function" do
     extra = args[:extra_identifier] || []
 
     scope = create_test_scope_for_node('localhost')
-    allow(scope).to receive(:[]).with("::fqdn").and_return(host)
+    scope.stubs(:[]).with("::fqdn").returns(host)
 
     scope.function_fqdn_rand([max] + extra)
   end

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

@@ -1,12 +1,9 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe "the generate function" do
   include PuppetSpec::Files
 
-  before :all do
-    Puppet::Parser::Functions.autoloader.loadall
-  end
-
   let :node     do Puppet::Node.new('localhost') end
   let :compiler do Puppet::Parser::Compiler.new(node) end
   let :scope    do Puppet::Parser::Scope.new(compiler) end
@@ -17,7 +14,7 @@ describe "the generate function" do
 
   it "accept a fully-qualified path as a command" do
     command = File.expand_path('/command/foo')
-    expect(Dir).to receive(:chdir).with(File.dirname(command)).and_return("yay")
+    Dir.expects(:chdir).with(File.dirname(command)).returns("yay")
     expect(scope.function_generate([command])).to eq("yay")
   end
 
@@ -33,39 +30,39 @@ describe "the generate function" do
     expect { scope.function_generate([File.expand_path('/com mand')]) }.to raise_error(Puppet::ParseError)
   end
 
-  it "should not accept a command containing '..'" do
+  it "should not accept a command containing '..'", :unless => RUBY_PLATFORM == 'java' do
     command = File.expand_path("/command/../")
     expect { scope.function_generate([command]) }.to raise_error(Puppet::ParseError)
   end
 
   it "should execute the generate script with the correct working directory" do
     command = File.expand_path("/command")
-    expect(Dir).to receive(:chdir).with(File.dirname(command)).and_return("yay")
+    Dir.expects(:chdir).with(File.dirname(command)).returns("yay")
     expect(scope.function_generate([command])).to eq('yay')
   end
 
-  describe "on Windows", :if => Puppet.features.microsoft_windows? do
+  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"
-      expect(Dir).to receive(:chdir).with(File.dirname(command)).and_return("yay")
+      Dir.expects(:chdir).with(File.dirname(command)).returns("yay")
       expect(scope.function_generate([command])).to eq('yay')
     end
 
     it "should accept lower-case drive letters" do
       command = 'd:/command/foo'
-      expect(Dir).to receive(:chdir).with(File.dirname(command)).and_return("yay")
+      Dir.expects(:chdir).with(File.dirname(command)).returns("yay")
       expect(scope.function_generate([command])).to eq('yay')
     end
 
     it "should accept upper-case drive letters" do
       command = 'D:/command/foo'
-      expect(Dir).to receive(:chdir).with(File.dirname(command)).and_return("yay")
+      Dir.expects(:chdir).with(File.dirname(command)).returns("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'
-      expect(Dir).to receive(:chdir).with(File.dirname(command)).and_return("yay")
+      Dir.expects(:chdir).with(File.dirname(command)).returns("yay")
       expect(scope.function_generate([command])).to eq('yay')
     end
 
@@ -85,42 +82,44 @@ describe "the generate function" do
 
     it "should accept plus and dash" do
       command = "/var/folders/9z/9zXImgchH8CZJh6SgiqS2U+++TM/-Tmp-/foo"
-      expect(Dir).to receive(:chdir).with(File.dirname(command)).and_return("yay")
+      Dir.expects(:chdir).with(File.dirname(command)).returns("yay")
       expect(scope.function_generate([command])).to eq('yay')
     end
   end
 
-  let :command do
-    script_containing('function_generate',
-      :windows => '@echo off' + "\n" + 'echo a-%1 b-%2',
-      :posix   => '#!/bin/sh' + "\n" + 'echo a-$1 b-$2')
-  end
+  describe "function_generate", :unless => RUBY_PLATFORM == 'java' do
+    let :command do
+      script_containing('function_generate',
+        :windows => '@echo off' + "\n" + 'echo a-%1 b-%2',
+        :posix   => '#!/bin/sh' + "\n" + 'echo a-$1 b-$2')
+    end
 
-  after :each do
-    File.delete(command) if Puppet::FileSystem.exist?(command)
-  end
+    after :each do
+      File.delete(command) if Puppet::FileSystem.exist?(command)
+    end
 
-  it "returns the output as a String" do
-    expect(scope.function_generate([command]).class).to eq(String)
-  end
+    it "returns the output as a String" do
+      expect(scope.function_generate([command]).class).to eq(String)
+    end
 
-  it "should call generator with no arguments" do
-    expect(scope.function_generate([command])).to eq("a- b-\n")
-  end
+    it "should call generator with no arguments" do
+      expect(scope.function_generate([command])).to eq("a- b-\n")
+    end
 
-  it "should call generator with one argument" do
-    expect(scope.function_generate([command, 'one'])).to eq("a-one b-\n")
-  end
+    it "should call generator with one argument" do
+      expect(scope.function_generate([command, 'one'])).to eq("a-one b-\n")
+    end
 
-  it "should call generator with wo arguments" do
-    expect(scope.function_generate([command, 'one', 'two'])).to eq("a-one b-two\n")
-  end
+    it "should call generator with wo arguments" do
+      expect(scope.function_generate([command, 'one', 'two'])).to eq("a-one b-two\n")
+    end
 
-  it "should fail if generator is not absolute" do
-    expect { scope.function_generate(['boo']) }.to raise_error(Puppet::ParseError)
-  end
+    it "should fail if generator is not absolute" do
+      expect { scope.function_generate(['boo']) }.to raise_error(Puppet::ParseError)
+    end
 
-  it "should fail if generator fails" do
-    expect { scope.function_generate(['/boo']) }.to raise_error(Puppet::ParseError)
+    it "should fail if generator fails" do
+      expect { scope.function_generate(['/boo']) }.to raise_error(Puppet::ParseError)
+    end
   end
 end

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

@@ -1,10 +1,7 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe "the inline_template function" do
-  before :all do
-    Puppet::Parser::Functions.autoloader.loadall
-  end
-
   let(:node) { Puppet::Node.new('localhost') }
   let(:compiler) { Puppet::Parser::Compiler.new(node) }
   let(:scope) { Puppet::Parser::Scope.new(compiler) }

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

@@ -1,10 +1,7 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe "the regsubst function" do
-  before :all do
-    Puppet::Parser::Functions.autoloader.loadall
-  end
-
   before :each do
     node     = Puppet::Node.new('localhost')
     compiler = Puppet::Parser::Compiler.new(node)

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

@@ -1,10 +1,7 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe "the scanf function" do
-  before :all do
-    Puppet::Parser::Functions.autoloader.loadall
-  end
-
   let(:node) { Puppet::Node.new('localhost') }
   let(:compiler) { Puppet::Parser::Compiler.new(node) }
   let(:scope) { Puppet::Parser::Scope.new(compiler) }

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

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

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

@@ -1,10 +1,7 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe "the split function" do
-  before :all do
-    Puppet::Parser::Functions.autoloader.loadall
-  end
-
   before :each do
     node     = Puppet::Node.new('localhost')
     compiler = Puppet::Parser::Compiler.new(node)

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

@@ -1,10 +1,7 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe "the sprintf function" do
-  before :all do
-    Puppet::Parser::Functions.autoloader.loadall
-  end
-
   before :each do
     node     = Puppet::Node.new('localhost')
     compiler = Puppet::Parser::Compiler.new(node)