puppet 6.0.7-x64-mingw32 → 6.0.8-x64-mingw32

data/spec/integration/configurer_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/configurer'
@@ -20,10 +19,10 @@ describe Puppet::Configurer do
     end
 
     it "should send a transaction report with valid data" do
-
-      @configurer.stubs(:save_last_run_summary)
-      Puppet::Transaction::Report.indirection.expects(:save).with do |report, x|
-        report.time.class == Time and report.logs.length > 0
+      allow(@configurer).to receive(:save_last_run_summary)
+      expect(Puppet::Transaction::Report.indirection).to receive(:save) do |report, x|
+        expect(report.time).to be_a(Time)
+        expect(report.logs.length).to be > 0
       end
 
       Puppet[:report] = true
@@ -33,7 +32,7 @@ describe Puppet::Configurer do
 
     it "should save a correct last run summary" do
       report = Puppet::Transaction::Report.new
-      Puppet::Transaction::Report.indirection.stubs(:save)
+      allow(Puppet::Transaction::Report.indirection).to receive(:save)
 
       Puppet[:lastrunfile] = tmpfile("lastrunfile")
       Puppet.settings.setting(:lastrunfile).mode = 0666

data/spec/integration/defaults_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/defaults'
@@ -26,7 +25,7 @@ describe "Puppet defaults" do
 
   describe "when setting the :factpath" do
     it "should add the :factpath to Facter's search paths" do
-      Facter.expects(:search).with("/my/fact/path")
+      expect(Facter).to receive(:search).with("/my/fact/path")
 
       Puppet.settings[:factpath] = "/my/fact/path"
     end
@@ -83,19 +82,19 @@ describe "Puppet defaults" do
   end
 
   it "should use the service user and group for the yamldir" do
-    Puppet.settings.stubs(:service_user_available?).returns true
-    Puppet.settings.stubs(:service_group_available?).returns true
+    allow(Puppet.settings).to receive(:service_user_available?).and_return(true)
+    allow(Puppet.settings).to receive(:service_group_available?).and_return(true)
     expect(Puppet.settings.setting(:yamldir).owner).to eq(Puppet.settings[:user])
     expect(Puppet.settings.setting(:yamldir).group).to eq(Puppet.settings[:group])
   end
 
   it "should specify that the host private key should be owned by the service user" do
-    Puppet.settings.stubs(:service_user_available?).returns true
+    allow(Puppet.settings).to receive(:service_user_available?).and_return(true)
     expect(Puppet.settings.setting(:hostprivkey).owner).to eq(Puppet.settings[:user])
   end
 
   it "should specify that the host certificate should be owned by the service user" do
-    Puppet.settings.stubs(:service_user_available?).returns true
+    allow(Puppet.settings).to receive(:service_user_available?).and_return(true)
     expect(Puppet.settings.setting(:hostcert).owner).to eq(Puppet.settings[:user])
   end
 

data/spec/integration/directory_environments_spec.rb

@@ -4,7 +4,7 @@ describe "directory environments" do
   let(:args) { ['--configprint', 'modulepath', '--environment', 'direnv'] }
   let(:puppet) do
     app = Puppet::Application[:apply]
-    app.stubs(:command_line).returns(stub('command_line', :args => []))
+    allow(app).to receive(:command_line).and_return(double('command_line', :args => []))
     app
   end
 

data/spec/integration/faces/config_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/face'
 
@@ -65,7 +64,7 @@ rando_key=foobar
     end
 
     before :each do
-      subject.stubs(:report_section_and_environment)
+      allow(subject).to receive(:report_section_and_environment)
     end
 
     # key must be a defined setting
@@ -74,13 +73,13 @@ rando_key=foobar
         value = "value#{key.reverse}value"
 
         # needed for the subject.set to write to correct file
-        Puppet.settings.stubs(:which_configuration_file).returns(tmp_config)
+        allow(Puppet.settings).to receive(:which_configuration_file).and_return(tmp_config)
         subject.set(key, value)
 
         # make sure subject.print looks at the newly modified settings
         test_settings = load_settings(tmp_config)
         # instead of the default Puppet.settings (implementation detail)
-        Puppet.stubs(:settings).returns(test_settings)
+        allow(Puppet).to receive(:settings).and_return(test_settings)
 
         result = subject.print()
         expect(render(:print, result)).to match(/^#{key} = #{value}$/)

data/spec/integration/faces/documentation_spec.rb

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

data/spec/integration/faces/plugin_spec.rb

@@ -46,7 +46,7 @@ describe "Puppet plugin face" do
   end
 
   def init_cli_args_and_apply_app(args = ["download"])
-    Puppet::Application.find(:plugin).new(stub('command_line', :subcommand_name => :plugin, :args => args))
+    Puppet::Application.find(:plugin).new(double('command_line', :subcommand_name => :plugin, :args => args))
   end
 
   it "processes a download request" do

data/spec/integration/file_bucket/file_spec.rb

@@ -1,5 +1,3 @@
-#! /usr/bin/env ruby
-
 require 'spec_helper'
 
 require 'puppet/file_bucket/file'
@@ -8,7 +6,7 @@ describe Puppet::FileBucket::File do
   describe "#indirection" do
     before :each do
       # Never connect to the network, no matter what
-      described_class.indirection.terminus(:rest).class.any_instance.stubs(:find)
+      allow_any_instance_of(described_class.indirection.terminus(:rest).class).to receive(:find)
     end
 
     describe "when running another application" do
@@ -17,7 +15,7 @@ describe Puppet::FileBucket::File do
         "filebucket://puppetmaster:8140/md5/d41d8cd98f00b204e9800998ecf8427e" => :rest,
       }.each do |key, terminus|
         it "should use the #{terminus} terminus when requesting #{key.inspect}" do
-          described_class.indirection.terminus(terminus).class.any_instance.expects(:find)
+          expect_any_instance_of(described_class.indirection.terminus(terminus).class).to receive(:find)
 
           described_class.indirection.find(key)
         end

data/spec/integration/file_serving/content_spec.rb

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

data/spec/integration/file_serving/fileset_spec.rb

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

data/spec/integration/file_serving/metadata_spec.rb

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

data/spec/integration/file_serving/terminus_helper_spec.rb

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

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

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/resource/catalog'
@@ -7,7 +6,7 @@ Puppet::Resource::Catalog.indirection.terminus(:compiler)
 
 describe Puppet::Resource::Catalog::Compiler do
   before do
-    Facter.stubs(:value).returns "something"
+    allow(Facter).to receive(:value).and_return("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"))
@@ -32,8 +31,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"))
-    Puppet::Resource::Catalog.indirection.terminus.stubs(:extract_facts_from_request)
-    Puppet::Resource::Catalog.indirection.terminus.stubs(:compile).returns(@catalog)
+    allow(Puppet::Resource::Catalog.indirection.terminus).to receive(:extract_facts_from_request)
+    allow(Puppet::Resource::Catalog.indirection.terminus).to receive(:compile).and_return(@catalog)
 
     @one.virtual = true
 
@@ -43,8 +42,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"))
-    Puppet::Resource::Catalog.indirection.terminus.stubs(:extract_facts_from_request)
-    Puppet::Resource::Catalog.indirection.terminus.stubs(:compile).returns(@catalog)
+    allow(Puppet::Resource::Catalog.indirection.terminus).to receive(:extract_facts_from_request)
+    allow(Puppet::Resource::Catalog.indirection.terminus).to receive(:compile).and_return(@catalog)
 
     @one.exported = true
 
@@ -54,8 +53,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"))
-    Puppet::Resource::Catalog.indirection.terminus.stubs(:extract_facts_from_request)
-    Puppet::Resource::Catalog.indirection.terminus.stubs(:compile).returns(@catalog)
+    allow(Puppet::Resource::Catalog.indirection.terminus).to receive(:extract_facts_from_request)
+    allow(Puppet::Resource::Catalog.indirection.terminus).to receive(:compile).and_return(@catalog)
 
     @one.exported = true
     @one.virtual = true
@@ -67,10 +66,10 @@ describe Puppet::Resource::Catalog::Compiler do
     Puppet[:node_terminus] = :memory
     Puppet::Node.indirection.save(Puppet::Node.new("mynode"))
 
-    Puppet::Parser::Resource::Catalog.any_instance.expects(:to_resource).with do |catalog|
-      expect(Puppet.lookup(:current_environment).name).to eq(:production)
-    end
+    catalog_environment = nil
+    expect_any_instance_of(Puppet::Parser::Resource::Catalog).to receive(:to_resource) {catalog_environment = Puppet.lookup(:current_environment).name}
 
     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")
-    Puppet::FileSystem.expects(:exist?).with(filepath).returns(true)
+    expect(Puppet::FileSystem).to receive(:exist?).with(filepath).and_return(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,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/files'
 require 'puppet_spec/compiler'
@@ -15,7 +14,7 @@ describe Puppet::Node::Facts::Facter do
       end
     end
 
-    Facter.stubs(:reset)
+    allow(Facter).to receive(:reset)
 
     cat = compile_to_catalog('notify { $downcase_test: }',
                              Puppet::Node.indirection.find('foo'))
@@ -38,7 +37,7 @@ describe Puppet::Node::Facts::Facter do
       EOF
 
       Puppet.initialize_settings(['--modulepath', factdir])
-      apply = Puppet::Application.find(:apply).new(stub('command_line', :subcommand_name => :apply, :args => ['--modulepath', factdir, '-e', 'notify { $custom: }']))
+      apply = Puppet::Application.find(:apply).new(double('command_line', :subcommand_name => :apply, :args => ['--modulepath', factdir, '-e', 'notify { $custom: }']))
 
       expect do
         expect { apply.run }.to exit_with(0)
@@ -53,7 +52,7 @@ describe Puppet::Node::Facts::Facter do
         EOF
 
       Puppet.initialize_settings(['--pluginfactdest', factdir])
-      apply = Puppet::Application.find(:apply).new(stub('command_line', :subcommand_name => :apply, :args => ['--pluginfactdest', factdir, '-e', 'notify { $foo: }']))
+      apply = Puppet::Application.find(:apply).new(double('command_line', :subcommand_name => :apply, :args => ['--pluginfactdest', factdir, '-e', 'notify { $foo: }']))
 
       expect do
         expect { apply.run }.to exit_with(0)
@@ -62,7 +61,7 @@ describe Puppet::Node::Facts::Facter do
   end
 
   it "adds the puppetversion fact" do
-    Facter.stubs(:reset)
+    allow(Facter).to receive(:reset)
 
     cat = compile_to_catalog('notify { $::puppetversion: }',
                              Puppet::Node.indirection.find('foo'))

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

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/indirector/file_content/file_server'
@@ -75,8 +74,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
-    Puppet::FileSystem.stubs(:exist?).returns true
-    Puppet::FileSystem.stubs(:exist?).with(Puppet[:fileserverconfig]).returns(true)
+    allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
+    allow(Puppet::FileSystem).to receive(:exist?).with(Puppet[:fileserverconfig]).and_return(true)
 
     path = tmpfile("file_server_testing")
 
@@ -87,14 +86,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")
-    mount1.stubs(:globalallow?).returns true
-    mount1.stubs(:allowed?).returns true
+    allow(mount1).to receive(:globalallow?).and_return(true)
+    allow(mount1).to receive(:allowed?).and_return(true)
     mount1.path = File.join(path, "%h")
 
-    parser = stub 'parser', :changed? => false
-    parser.stubs(:parse).returns("one" => mount1)
+    parser = double('parser', :changed? => false)
+    allow(parser).to receive(:parse).and_return("one" => mount1)
 
-    Puppet::FileServing::Configuration::Parser.stubs(:new).returns(parser)
+    allow(Puppet::FileServing::Configuration::Parser).to receive(:new).and_return(parser)
 
     path = File.join(path, "myfile")
 

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

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/indirector/file_metadata/file_server'
@@ -55,19 +54,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
-        Puppet::FileSystem.stubs(:exist?).with(checksum_file).returns true
-        Puppet::FileSystem.stubs(:exist?).with(Puppet[:fileserverconfig]).returns(true)
+        allow(Puppet::FileSystem).to receive(:exist?).with(checksum_file).and_return(true)
+        allow(Puppet::FileSystem).to receive(:exist?).with(Puppet[:fileserverconfig]).and_return(true)
 
         # Use a real mount, so the integration is a bit deeper.
         mount1 = Puppet::FileServing::Configuration::Mount::File.new("one")
-        mount1.stubs(:globalallow?).returns true
-        mount1.stubs(:allowed?).returns true
+        allow(mount1).to receive(:globalallow?).and_return(true)
+        allow(mount1).to receive(:allowed?).and_return(true)
         mount1.path = File.join(env_path, "%h")
 
-        parser = stub 'parser', :changed? => false
-        parser.stubs(:parse).returns("one" => mount1)
+        parser = double('parser', :changed? => false)
+        allow(parser).to receive(:parse).and_return("one" => mount1)
 
-        Puppet::FileServing::Configuration::Parser.stubs(:new).returns(parser)
+        allow(Puppet::FileServing::Configuration::Parser).to receive(:new).and_return(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,8 +3,7 @@ require 'spec_helper'
 require 'puppet/network/authconfig'
 require 'puppet/network/auth_config_parser'
 
-RSpec::Matchers.define :allow do |params|
-
+RSpec::Matchers.define :auth_allow do |params|
   match do |auth|
     begin
       auth.check_authorization(*params)
@@ -61,7 +60,7 @@ describe Puppet::Network::AuthConfig do
     it "should not match IP addresses" do
       add_rule("allow 10.1.1.1")
 
-      expect(@auth).not_to allow(request)
+      expect(@auth).not_to auth_allow(request)
     end
 
     it "should not accept CIDR IPv4 address" do
@@ -85,13 +84,13 @@ describe Puppet::Network::AuthConfig do
     it "should support hostname" do
       add_rule("allow host.domain.com")
 
-      expect(@auth).to allow(request)
+      expect(@auth).to auth_allow(request)
     end
 
     it "should support wildcard host" do
       add_rule("allow *.domain.com")
 
-      expect(@auth).to allow(request)
+      expect(@auth).to auth_allow(request)
     end
 
     it 'should warn about missing path before allow_ip in stanza' do
@@ -109,51 +108,51 @@ describe Puppet::Network::AuthConfig do
     it "should support hostname backreferences" do
       add_regex_rule('^/test/([^/]+)$', "allow $1.domain.com")
 
-      expect(@auth).to allow(request(:key => 'host'))
+      expect(@auth).to auth_allow(request(:key => 'host'))
     end
 
     it "should support opaque strings" do
       add_rule("allow this-is-opaque@or-not")
 
-      expect(@auth).to allow(request(:node => 'this-is-opaque@or-not'))
+      expect(@auth).to auth_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 allow(request(:key => 'this-is-opaque@or-not', :node => 'this-is-opaque@or-not'))
+      expect(@auth).to auth_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 allow(request(:node => 'host.domain.com.'))
+      expect(@auth).to auth_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 allow(request(:node => 'host.domain.com.'))
+      expect(@auth).to auth_allow(request(:node => 'host.domain.com.'))
     end
 
     it "should support trailing whitespace" do
       add_rule('allow host.domain.com    ')
 
-      expect(@auth).to allow(request)
+      expect(@auth).to auth_allow(request)
     end
 
     it "should support inlined comments" do
       add_rule('allow host.domain.com # will it work?')
 
-      expect(@auth).to allow(request)
+      expect(@auth).to auth_allow(request)
     end
 
     it "should deny non-matching host" do
       add_rule("allow inexistent")
 
-      expect(@auth).not_to allow(request)
+      expect(@auth).not_to auth_allow(request)
     end
   end
 
@@ -161,7 +160,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 allow(request)
+      expect(@auth).not_to auth_allow(request)
 
       expect(@logs).not_to be_any {|log| log.level == :warning and log.message =~ /Authentication based on IP address is deprecated/}
     end
@@ -169,25 +168,25 @@ describe Puppet::Network::AuthConfig do
     it "should support IPv4 address" do
       add_rule("allow_ip 10.1.1.1")
 
-      expect(@auth).to allow(request)
+      expect(@auth).to auth_allow(request)
     end
 
     it "should support CIDR IPv4 address" do
       add_rule("allow_ip 10.0.0.0/8")
 
-      expect(@auth).to allow(request)
+      expect(@auth).to auth_allow(request)
     end
 
     it "should support wildcard IPv4 address" do
       add_rule("allow_ip 10.1.1.*")
 
-      expect(@auth).to allow(request)
+      expect(@auth).to auth_allow(request)
     end
 
     it "should support IPv6 address" do
       add_rule("allow_ip 2001:DB8::8:800:200C:417A")
 
-      expect(@auth).to allow(request(:ip => '2001:DB8::8:800:200C:417A'))
+      expect(@auth).to auth_allow(request(:ip => '2001:DB8::8:800:200C:417A'))
     end
 
     it "should support hostname" do
@@ -204,7 +203,7 @@ describe Puppet::Network::AuthConfig do
         allow *.domain.com
       EOALLOWRULE
 
-      expect(@auth).not_to allow(request)
+      expect(@auth).not_to auth_allow(request)
     end
 
     it "denies denied hosts after allowing them" do
@@ -213,7 +212,7 @@ describe Puppet::Network::AuthConfig do
         deny host.domain.com
       EOALLOWRULE
 
-      expect(@auth).not_to allow(request)
+      expect(@auth).not_to auth_allow(request)
     end
 
     it "should not deny based on IP" do
@@ -222,7 +221,7 @@ describe Puppet::Network::AuthConfig do
         allow host.domain.com
       EOALLOWRULE
 
-      expect(@auth).to allow(request)
+      expect(@auth).to auth_allow(request)
     end
 
     it "should not deny based on IP (ordering #2)" do
@@ -231,7 +230,7 @@ describe Puppet::Network::AuthConfig do
         deny 10.1.1.1
       EOALLOWRULE
 
-      expect(@auth).to allow(request)
+      expect(@auth).to auth_allow(request)
     end
   end
 
@@ -242,7 +241,7 @@ describe Puppet::Network::AuthConfig do
         allow host.domain.com
       EOALLOWRULE
 
-      expect(@auth).not_to allow(request)
+      expect(@auth).not_to auth_allow(request)
     end
 
     it "should deny based on IP (ordering #2)" do
@@ -251,7 +250,7 @@ describe Puppet::Network::AuthConfig do
         deny_ip 10.1.1.1
       EOALLOWRULE
 
-      expect(@auth).not_to allow(request)
+      expect(@auth).not_to auth_allow(request)
     end
   end
 end