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

data/spec/integration/file_serving/metadata_spec.rb

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

data/spec/integration/file_serving/terminus_helper_spec.rb

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

data/spec/integration/file_system/uniquefile_spec.rb

@@ -1,29 +1,26 @@
-require 'spec_helper'
-
-describe Puppet::FileSystem::Uniquefile do
-
-  describe "#open_tmp on Windows", :if => Puppet.features.microsoft_windows? do
-
-    describe "with UTF8 characters" do
-      include PuppetSpec::Files
-
-      let(:rune_utf8) { "\u16A0\u16C7\u16BB\u16EB\u16D2\u16E6\u16A6\u16EB\u16A0\u16B1\u16A9\u16A0\u16A2\u16B1\u16EB\u16A0\u16C1\u16B1\u16AA\u16EB\u16B7\u16D6\u16BB\u16B9\u16E6\u16DA\u16B3\u16A2\u16D7" }
-      let(:temp_rune_utf8) { tmpdir(rune_utf8) }
-
-      it "should use UTF8 characters in TMP,TEMP,TMPDIR environment variable" do
-        # Set the temporary environment variables to the UTF8 temp path
-        Puppet::Util::Windows::Process.set_environment_variable('TMPDIR', temp_rune_utf8)
-        Puppet::Util::Windows::Process.set_environment_variable('TMP', temp_rune_utf8)
-        Puppet::Util::Windows::Process.set_environment_variable('TEMP', temp_rune_utf8)
-
-        # Create a unique file
-        filename = Puppet::FileSystem::Uniquefile.open_tmp('foo') do |file|
-          File.dirname(file.path)
-        end
-
-        expect(filename).to eq(temp_rune_utf8)
-      end
-    end
-  end
-
-end
+require 'spec_helper'
+
+describe Puppet::FileSystem::Uniquefile do
+  describe "#open_tmp on Windows", :if => Puppet::Util::Platform.windows? do
+    describe "with UTF8 characters" do
+      include PuppetSpec::Files
+
+      let(:rune_utf8) { "\u16A0\u16C7\u16BB\u16EB\u16D2\u16E6\u16A6\u16EB\u16A0\u16B1\u16A9\u16A0\u16A2\u16B1\u16EB\u16A0\u16C1\u16B1\u16AA\u16EB\u16B7\u16D6\u16BB\u16B9\u16E6\u16DA\u16B3\u16A2\u16D7" }
+      let(:temp_rune_utf8) { tmpdir(rune_utf8) }
+
+      it "should use UTF8 characters in TMP,TEMP,TMPDIR environment variable" do
+        # Set the temporary environment variables to the UTF8 temp path
+        Puppet::Util::Windows::Process.set_environment_variable('TMPDIR', temp_rune_utf8)
+        Puppet::Util::Windows::Process.set_environment_variable('TMP', temp_rune_utf8)
+        Puppet::Util::Windows::Process.set_environment_variable('TEMP', temp_rune_utf8)
+
+        # Create a unique file
+        filename = Puppet::FileSystem::Uniquefile.open_tmp('foo') do |file|
+          File.dirname(file.path)
+        end
+
+        expect(filename).to eq(temp_rune_utf8)
+      end
+    end
+  end
+end

data/spec/integration/indirector/catalog/compiler_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/resource/catalog'
@@ -6,7 +7,7 @@ Puppet::Resource::Catalog.indirection.terminus(:compiler)
 
 describe Puppet::Resource::Catalog::Compiler do
   before do
-    allow(Facter).to receive(:value).and_return("something")
+    Facter.stubs(:value).returns "something"
     @catalog = Puppet::Resource::Catalog.new("testing", Puppet::Node::Environment::NONE)
     @catalog.add_resource(@one = Puppet::Resource.new(:file, "/one"))
     @catalog.add_resource(@two = Puppet::Resource.new(:file, "/two"))
@@ -31,8 +32,8 @@ describe Puppet::Resource::Catalog::Compiler do
   it "should filter out virtual resources when finding a catalog" do
     Puppet[:node_terminus] = :memory
     Puppet::Node.indirection.save(Puppet::Node.new("mynode"))
-    allow(Puppet::Resource::Catalog.indirection.terminus).to receive(:extract_facts_from_request)
-    allow(Puppet::Resource::Catalog.indirection.terminus).to receive(:compile).and_return(@catalog)
+    Puppet::Resource::Catalog.indirection.terminus.stubs(:extract_facts_from_request)
+    Puppet::Resource::Catalog.indirection.terminus.stubs(:compile).returns(@catalog)
 
     @one.virtual = true
 
@@ -42,8 +43,8 @@ describe Puppet::Resource::Catalog::Compiler do
   it "should not filter out exported resources when finding a catalog" do
     Puppet[:node_terminus] = :memory
     Puppet::Node.indirection.save(Puppet::Node.new("mynode"))
-    allow(Puppet::Resource::Catalog.indirection.terminus).to receive(:extract_facts_from_request)
-    allow(Puppet::Resource::Catalog.indirection.terminus).to receive(:compile).and_return(@catalog)
+    Puppet::Resource::Catalog.indirection.terminus.stubs(:extract_facts_from_request)
+    Puppet::Resource::Catalog.indirection.terminus.stubs(:compile).returns(@catalog)
 
     @one.exported = true
 
@@ -53,8 +54,8 @@ describe Puppet::Resource::Catalog::Compiler do
   it "should filter out virtual exported resources when finding a catalog" do
     Puppet[:node_terminus] = :memory
     Puppet::Node.indirection.save(Puppet::Node.new("mynode"))
-    allow(Puppet::Resource::Catalog.indirection.terminus).to receive(:extract_facts_from_request)
-    allow(Puppet::Resource::Catalog.indirection.terminus).to receive(:compile).and_return(@catalog)
+    Puppet::Resource::Catalog.indirection.terminus.stubs(:extract_facts_from_request)
+    Puppet::Resource::Catalog.indirection.terminus.stubs(:compile).returns(@catalog)
 
     @one.exported = true
     @one.virtual = true
@@ -66,10 +67,10 @@ describe Puppet::Resource::Catalog::Compiler do
     Puppet[:node_terminus] = :memory
     Puppet::Node.indirection.save(Puppet::Node.new("mynode"))
 
-    catalog_environment = nil
-    expect_any_instance_of(Puppet::Parser::Resource::Catalog).to receive(:to_resource) {catalog_environment = Puppet.lookup(:current_environment).name}
+    Puppet::Parser::Resource::Catalog.any_instance.expects(:to_resource).with do |catalog|
+      expect(Puppet.lookup(:current_environment).name).to eq(:production)
+    end
 
     Puppet::Resource::Catalog.indirection.find("mynode")
-    expect(catalog_environment).to eq(:production)
   end
 end

data/spec/integration/indirector/direct_file_server_spec.rb

@@ -14,7 +14,7 @@ describe Puppet::Indirector::DirectFileServer, " when interacting with the files
 
   it "should return an instance of the model" do
     filepath = make_absolute("/path/to/my/file")
-    expect(Puppet::FileSystem).to receive(:exist?).with(filepath).and_return(true)
+    Puppet::FileSystem.expects(:exist?).with(filepath).returns(true)
 
     expect(@terminus.find(@terminus.indirection.request(:find, Puppet::Util.path_to_uri(filepath).to_s, nil))).to be_instance_of(Puppet::FileServing::Content)
   end

data/spec/integration/indirector/facts/facter_spec.rb

@@ -1,5 +1,5 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
-
 require 'puppet_spec/files'
 require 'puppet_spec/compiler'
 require 'puppet/indirector/facts/facter'
@@ -8,10 +8,6 @@ describe Puppet::Node::Facts::Facter do
   include PuppetSpec::Files
   include PuppetSpec::Compiler
 
-  before :each do
-    Puppet::Node::Facts.indirection.terminus_class = :facter
-  end
-
   it "preserves case in fact values" do
     Facter.add(:downcase_test) do
       setcode do
@@ -19,7 +15,7 @@ describe Puppet::Node::Facts::Facter do
       end
     end
 
-    allow(Facter).to receive(:reset)
+    Facter.stubs(:reset)
 
     cat = compile_to_catalog('notify { $downcase_test: }',
                              Puppet::Node.indirection.find('foo'))
@@ -42,7 +38,7 @@ describe Puppet::Node::Facts::Facter do
       EOF
 
       Puppet.initialize_settings(['--modulepath', factdir])
-      apply = Puppet::Application.find(:apply).new(double('command_line', :subcommand_name => :apply, :args => ['--modulepath', factdir, '-e', 'notify { $custom: }']))
+      apply = Puppet::Application.find(:apply).new(stub('command_line', :subcommand_name => :apply, :args => ['--modulepath', factdir, '-e', 'notify { $custom: }']))
 
       expect do
         expect { apply.run }.to exit_with(0)
@@ -50,24 +46,14 @@ describe Puppet::Node::Facts::Facter do
     end
 
     it "should resolve external facts" do
-      external_fact = File.join(factdir, 'external')
+      external_fact = File.join(factdir, 'external.json')
 
-      if Puppet.features.microsoft_windows?
-        external_fact += '.bat'
-        File.open(external_fact, 'wb') { |file| file.write(<<-EOF)}
-        @echo foo=bar
+      File.open(external_fact, 'wb') { |file| file.write(<<-EOF)}
+        {"foo": "bar"}
         EOF
-      else
-        File.open(external_fact, 'wb') { |file| file.write(<<-EOF)}
-        #!/bin/sh
-        echo "foo=bar"
-        EOF
-
-        Puppet::FileSystem.chmod(0755, external_fact)
-      end
 
       Puppet.initialize_settings(['--pluginfactdest', factdir])
-      apply = Puppet::Application.find(:apply).new(double('command_line', :subcommand_name => :apply, :args => ['--pluginfactdest', factdir, '-e', 'notify { $foo: }']))
+      apply = Puppet::Application.find(:apply).new(stub('command_line', :subcommand_name => :apply, :args => ['--pluginfactdest', factdir, '-e', 'notify { $foo: }']))
 
       expect do
         expect { apply.run }.to exit_with(0)
@@ -76,7 +62,7 @@ describe Puppet::Node::Facts::Facter do
   end
 
   it "adds the puppetversion fact" do
-    allow(Facter).to receive(:reset)
+    Facter.stubs(:reset)
 
     cat = compile_to_catalog('notify { $::puppetversion: }',
                              Puppet::Node.indirection.find('foo'))

data/spec/integration/indirector/file_content/file_server_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/indirector/file_content/file_server'
@@ -74,8 +75,8 @@ describe Puppet::Indirector::FileContent::FileServer, " when finding files" do
   end
 
   it "should find file content in files when node name expansions are used" do
-    allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
-    allow(Puppet::FileSystem).to receive(:exist?).with(Puppet[:fileserverconfig]).and_return(true)
+    Puppet::FileSystem.stubs(:exist?).returns true
+    Puppet::FileSystem.stubs(:exist?).with(Puppet[:fileserverconfig]).returns(true)
 
     path = tmpfile("file_server_testing")
 
@@ -86,14 +87,14 @@ describe Puppet::Indirector::FileContent::FileServer, " when finding files" do
 
     # Use a real mount, so the integration is a bit deeper.
     mount1 = Puppet::FileServing::Configuration::Mount::File.new("one")
-    allow(mount1).to receive(:globalallow?).and_return(true)
-    allow(mount1).to receive(:allowed?).and_return(true)
+    mount1.stubs(:globalallow?).returns true
+    mount1.stubs(:allowed?).returns true
     mount1.path = File.join(path, "%h")
 
-    parser = double('parser', :changed? => false)
-    allow(parser).to receive(:parse).and_return("one" => mount1)
+    parser = stub 'parser', :changed? => false
+    parser.stubs(:parse).returns("one" => mount1)
 
-    allow(Puppet::FileServing::Configuration::Parser).to receive(:new).and_return(parser)
+    Puppet::FileServing::Configuration::Parser.stubs(:new).returns(parser)
 
     path = File.join(path, "myfile")
 

data/spec/integration/indirector/file_metadata/file_server_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/indirector/file_metadata/file_server'
@@ -54,19 +55,19 @@ describe Puppet::Indirector::FileMetadata::FileServer, " when finding files" do
   describe "when node name expansions are used" do
     with_checksum_types("file_server_testing", "mynode/myfile") do
       it "should return the correct metadata" do
-        allow(Puppet::FileSystem).to receive(:exist?).with(checksum_file).and_return(true)
-        allow(Puppet::FileSystem).to receive(:exist?).with(Puppet[:fileserverconfig]).and_return(true)
+        Puppet::FileSystem.stubs(:exist?).with(checksum_file).returns true
+        Puppet::FileSystem.stubs(:exist?).with(Puppet[:fileserverconfig]).returns(true)
 
         # Use a real mount, so the integration is a bit deeper.
         mount1 = Puppet::FileServing::Configuration::Mount::File.new("one")
-        allow(mount1).to receive(:globalallow?).and_return(true)
-        allow(mount1).to receive(:allowed?).and_return(true)
+        mount1.stubs(:globalallow?).returns true
+        mount1.stubs(:allowed?).returns true
         mount1.path = File.join(env_path, "%h")
 
-        parser = double('parser', :changed? => false)
-        allow(parser).to receive(:parse).and_return("one" => mount1)
+        parser = stub 'parser', :changed? => false
+        parser.stubs(:parse).returns("one" => mount1)
 
-        allow(Puppet::FileServing::Configuration::Parser).to receive(:new).and_return(parser)
+        Puppet::FileServing::Configuration::Parser.stubs(:new).returns(parser)
         env = Puppet::Node::Environment.create(:foo, [])
 
         result = Puppet::FileServing::Metadata.indirection.find("one/myfile", :environment => env, :node => "mynode", :checksum_type => checksum_type)

data/spec/integration/network/authconfig_spec.rb

@@ -3,7 +3,8 @@ require 'spec_helper'
 require 'puppet/network/authconfig'
 require 'puppet/network/auth_config_parser'
 
-RSpec::Matchers.define :auth_allow do |params|
+RSpec::Matchers.define :allow do |params|
+
   match do |auth|
     begin
       auth.check_authorization(*params)
@@ -60,7 +61,7 @@ describe Puppet::Network::AuthConfig do
     it "should not match IP addresses" do
       add_rule("allow 10.1.1.1")
 
-      expect(@auth).not_to auth_allow(request)
+      expect(@auth).not_to allow(request)
     end
 
     it "should not accept CIDR IPv4 address" do
@@ -84,13 +85,13 @@ describe Puppet::Network::AuthConfig do
     it "should support hostname" do
       add_rule("allow host.domain.com")
 
-      expect(@auth).to auth_allow(request)
+      expect(@auth).to allow(request)
     end
 
     it "should support wildcard host" do
       add_rule("allow *.domain.com")
 
-      expect(@auth).to auth_allow(request)
+      expect(@auth).to allow(request)
     end
 
     it 'should warn about missing path before allow_ip in stanza' do
@@ -108,51 +109,51 @@ describe Puppet::Network::AuthConfig do
     it "should support hostname backreferences" do
       add_regex_rule('^/test/([^/]+)$', "allow $1.domain.com")
 
-      expect(@auth).to auth_allow(request(:key => 'host'))
+      expect(@auth).to allow(request(:key => 'host'))
     end
 
     it "should support opaque strings" do
       add_rule("allow this-is-opaque@or-not")
 
-      expect(@auth).to auth_allow(request(:node => 'this-is-opaque@or-not'))
+      expect(@auth).to allow(request(:node => 'this-is-opaque@or-not'))
     end
 
     it "should support opaque strings and backreferences" do
       add_regex_rule('^/test/([^/]+)$', "allow $1")
 
-      expect(@auth).to auth_allow(request(:key => 'this-is-opaque@or-not', :node => 'this-is-opaque@or-not'))
+      expect(@auth).to allow(request(:key => 'this-is-opaque@or-not', :node => 'this-is-opaque@or-not'))
     end
 
     it "should support hostname ending with '.'" do
       pending('bug #7589')
       add_rule("allow host.domain.com.")
 
-      expect(@auth).to auth_allow(request(:node => 'host.domain.com.'))
+      expect(@auth).to allow(request(:node => 'host.domain.com.'))
     end
 
     it "should support hostname ending with '.' and backreferences" do
       pending('bug #7589')
       add_regex_rule('^/test/([^/]+)$',"allow $1")
 
-      expect(@auth).to auth_allow(request(:node => 'host.domain.com.'))
+      expect(@auth).to allow(request(:node => 'host.domain.com.'))
     end
 
     it "should support trailing whitespace" do
       add_rule('allow host.domain.com    ')
 
-      expect(@auth).to auth_allow(request)
+      expect(@auth).to allow(request)
     end
 
     it "should support inlined comments" do
       add_rule('allow host.domain.com # will it work?')
 
-      expect(@auth).to auth_allow(request)
+      expect(@auth).to allow(request)
     end
 
     it "should deny non-matching host" do
       add_rule("allow inexistent")
 
-      expect(@auth).not_to auth_allow(request)
+      expect(@auth).not_to allow(request)
     end
   end
 
@@ -160,7 +161,7 @@ describe Puppet::Network::AuthConfig do
     it "should not warn when matches against IP addresses fail" do
       add_rule("allow_ip 10.1.1.2")
 
-      expect(@auth).not_to auth_allow(request)
+      expect(@auth).not_to allow(request)
 
       expect(@logs).not_to be_any {|log| log.level == :warning and log.message =~ /Authentication based on IP address is deprecated/}
     end
@@ -168,25 +169,25 @@ describe Puppet::Network::AuthConfig do
     it "should support IPv4 address" do
       add_rule("allow_ip 10.1.1.1")
 
-      expect(@auth).to auth_allow(request)
+      expect(@auth).to allow(request)
     end
 
     it "should support CIDR IPv4 address" do
       add_rule("allow_ip 10.0.0.0/8")
 
-      expect(@auth).to auth_allow(request)
+      expect(@auth).to allow(request)
     end
 
     it "should support wildcard IPv4 address" do
       add_rule("allow_ip 10.1.1.*")
 
-      expect(@auth).to auth_allow(request)
+      expect(@auth).to allow(request)
     end
 
     it "should support IPv6 address" do
       add_rule("allow_ip 2001:DB8::8:800:200C:417A")
 
-      expect(@auth).to auth_allow(request(:ip => '2001:DB8::8:800:200C:417A'))
+      expect(@auth).to allow(request(:ip => '2001:DB8::8:800:200C:417A'))
     end
 
     it "should support hostname" do
@@ -203,7 +204,7 @@ describe Puppet::Network::AuthConfig do
         allow *.domain.com
       EOALLOWRULE
 
-      expect(@auth).not_to auth_allow(request)
+      expect(@auth).not_to allow(request)
     end
 
     it "denies denied hosts after allowing them" do
@@ -212,7 +213,7 @@ describe Puppet::Network::AuthConfig do
         deny host.domain.com
       EOALLOWRULE
 
-      expect(@auth).not_to auth_allow(request)
+      expect(@auth).not_to allow(request)
     end
 
     it "should not deny based on IP" do
@@ -221,7 +222,7 @@ describe Puppet::Network::AuthConfig do
         allow host.domain.com
       EOALLOWRULE
 
-      expect(@auth).to auth_allow(request)
+      expect(@auth).to allow(request)
     end
 
     it "should not deny based on IP (ordering #2)" do
@@ -230,7 +231,7 @@ describe Puppet::Network::AuthConfig do
         deny 10.1.1.1
       EOALLOWRULE
 
-      expect(@auth).to auth_allow(request)
+      expect(@auth).to allow(request)
     end
   end
 
@@ -241,7 +242,7 @@ describe Puppet::Network::AuthConfig do
         allow host.domain.com
       EOALLOWRULE
 
-      expect(@auth).not_to auth_allow(request)
+      expect(@auth).not_to allow(request)
     end
 
     it "should deny based on IP (ordering #2)" do
@@ -250,7 +251,7 @@ describe Puppet::Network::AuthConfig do
         deny_ip 10.1.1.1
       EOALLOWRULE
 
-      expect(@auth).not_to auth_allow(request)
+      expect(@auth).not_to allow(request)
     end
   end
 end