puppet 6.0.10-x64-mingw32 → 6.1.0-x64-mingw32

data/spec/integration/transaction_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/compiler'
 
@@ -13,7 +14,7 @@ describe Puppet::Transaction do
   include PuppetSpec::Compiler
 
   before do
-    allow(Puppet::Util::Storage).to receive(:store)
+    Puppet::Util::Storage.stubs(:store)
   end
 
   def mk_catalog(*resources)
@@ -41,14 +42,14 @@ describe Puppet::Transaction do
 
     child_resource = Puppet::Type.type(:file).new :path => make_absolute("/foo/bar/baz"), :backup => false
 
-    expect(resource).to receive(:eval_generate).and_return([child_resource])
+    resource.expects(:eval_generate).returns([child_resource])
 
     transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::SequentialPrioritizer.new)
 
-    expect(resource).to receive(:retrieve).and_raise("this is a failure")
-    allow(resource).to receive(:err)
+    resource.expects(:retrieve).raises "this is a failure"
+    resource.stubs(:err)
 
-    expect(child_resource).not_to receive(:retrieve)
+    child_resource.expects(:retrieve).never
 
     transaction.evaluate
   end
@@ -61,7 +62,7 @@ describe Puppet::Transaction do
 
     transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::SequentialPrioritizer.new)
 
-    expect(resource).not_to receive(:evaluate)
+    resource.expects(:evaluate).never
 
     transaction.evaluate
   end
@@ -86,7 +87,7 @@ describe Puppet::Transaction do
 
     transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::SequentialPrioritizer.new)
 
-    expect(resource).not_to receive(:evaluate)
+    resource.expects(:evaluate).never
 
     transaction.evaluate
   end
@@ -99,7 +100,7 @@ describe Puppet::Transaction do
     transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::SequentialPrioritizer.new)
     transaction.for_network_device = false
 
-    expect(transaction).not_to receive(:apply).with(resource, nil)
+    transaction.expects(:apply).never.with(resource, nil)
 
     transaction.evaluate
     expect(transaction.resource_status(resource)).to be_skipped
@@ -113,7 +114,7 @@ describe Puppet::Transaction do
     transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::SequentialPrioritizer.new)
     transaction.for_network_device = true
 
-    expect(transaction).not_to receive(:apply).with(resource, nil)
+    transaction.expects(:apply).never.with(resource, nil)
 
     transaction.evaluate
     expect(transaction.resource_status(resource)).to be_skipped
@@ -127,7 +128,7 @@ describe Puppet::Transaction do
     transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::SequentialPrioritizer.new)
     transaction.for_network_device = true
 
-    expect(transaction).to receive(:apply).with(resource, nil)
+    transaction.expects(:apply).with(resource, nil)
 
     transaction.evaluate
     expect(transaction.resource_status(resource)).not_to be_skipped
@@ -141,7 +142,7 @@ describe Puppet::Transaction do
     transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::SequentialPrioritizer.new)
     transaction.for_network_device = true
 
-    expect(transaction).to receive(:apply).with(resource, nil)
+    transaction.expects(:apply).with(resource, nil)
 
     transaction.evaluate
     expect(transaction.resource_status(resource)).not_to be_skipped
@@ -167,7 +168,7 @@ describe Puppet::Transaction do
     ecomp[:subscribe] = Puppet::Resource.new(:foo, "file")
     exec[:refreshonly] = true
 
-    expect(exec).to receive(:refresh)
+    exec.expects(:refresh)
     catalog.apply
   end
 
@@ -231,7 +232,7 @@ describe Puppet::Transaction do
     notify = Puppet::Type.type(:notify).new(
       :title => "foo"
     )
-    expect(notify).to receive(:pre_run_check).and_raise(Puppet::Error, "fail for testing")
+    notify.expects(:pre_run_check).raises(Puppet::Error, "fail for testing")
 
     catalog = mk_catalog(file, notify)
     expect { catalog.apply }.to raise_error(Puppet::Error, /Some pre-run checks failed/)
@@ -264,7 +265,7 @@ describe Puppet::Transaction do
       :title => "two"
     )
 
-    allow(exec1).to receive(:err)
+    exec1.stubs(:err)
 
     catalog = mk_catalog(file, exec1, exec2)
     catalog.apply
@@ -321,8 +322,8 @@ describe Puppet::Transaction do
           :command     => touch(file1),
         )
 
-        allow(exec1).to receive(:eval_generate).and_return(
-          [ Puppet::Type.type(:notify).new(:name => "eval1_notify") ]
+        exec1.stubs(:eval_generate).returns(
+          [ (Puppet::Type.type(:notify).new :name => "eval1_notify")]
         )
 
         exec2 = Puppet::Type.type(:exec).new(
@@ -332,8 +333,8 @@ describe Puppet::Transaction do
           :refreshonly => true,
           :subscribe   => exec1,
         )
-        allow(exec2).to receive(:eval_generate).and_return(
-          [ Puppet::Type.type(:notify).new(:name => "eval2_notify") ]
+        exec2.stubs(:eval_generate).returns(
+          [ (Puppet::Type.type(:notify).new :name => "eval2_notify")]
         )
 
         Puppet[:tags] = "exec"

data/spec/integration/type/exec_spec.rb

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

data/spec/integration/type/file_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet_spec/files'
@@ -78,10 +79,10 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
 
   before do
     # stub this to not try to create state.yaml
-    allow(Puppet::Util::Storage).to receive(:store)
+    Puppet::Util::Storage.stubs(:store)
 
-    allow_any_instance_of(Puppet::Type.type(:file)).to receive(:file).and_return('my/file.pp')
-    allow_any_instance_of(Puppet::Type.type(:file)).to receive(:line).and_return(5)
+    Puppet::Type.type(:file).any_instance.stubs(:file).returns('my/file.pp')
+    Puppet::Type.type(:file).any_instance.stubs(:line).returns 5
   end
 
   it "should not attempt to manage files that do not exist if no means of creating the file is specified" do
@@ -418,7 +419,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
 
             it "should not give a deprecation warning about using a checksum in content when using source to define content" do
               FileUtils.touch(path)
-              expect(Puppet).not_to receive(:puppet_deprecation_warning)
+              Puppet.expects(:puppet_deprecation_warning).never
               catalog.add_resource described_class.new(:path => path, :source => link, :links => :follow)
               catalog.apply
             end
@@ -532,7 +533,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
         # Create a directory where the backup should be so that writing to it fails
         Dir.mkdir(File.join(dir, "testfile.bak"))
 
-        allow(Puppet::Util::Log).to receive(:newmessage)
+        Puppet::Util::Log.stubs(:newmessage)
 
         catalog.apply
 
@@ -602,7 +603,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
     end
 
     it "should not give a checksum deprecation warning when given actual content" do
-      expect(Puppet).not_to receive(:puppet_deprecation_warning)
+      Puppet.expects(:puppet_deprecation_warning).never
       catalog.add_resource described_class.new(:path => path, :content => 'this is content')
       catalog.apply
     end
@@ -613,14 +614,14 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
       end
 
       it "should give a checksum deprecation warning" do
-        expect(Puppet).to receive(:puppet_deprecation_warning).with('Using a checksum in a file\'s "content" property is deprecated. The ability to use a checksum to retrieve content from the filebucket using the "content" property will be removed in a future release. The literal value of the "content" property will be written to the file. The checksum retrieval functionality is being replaced by the use of static catalogs. See https://puppet.com/docs/puppet/latest/static_catalogs.html for more information.', {:file => 'my/file.pp', :line => 5})
+        Puppet.expects(:puppet_deprecation_warning).with('Using a checksum in a file\'s "content" property is deprecated. The ability to use a checksum to retrieve content from the filebucket using the "content" property will be removed in a future release. The literal value of the "content" property will be written to the file. The checksum retrieval functionality is being replaced by the use of static catalogs. See https://puppet.com/docs/puppet/latest/static_catalogs.html for more information.', {:file => 'my/file.pp', :line => 5})
         d = digest("this is some content")
         catalog.add_resource described_class.new(:path => path, :content => "{#{digest_algorithm}}#{d}")
         catalog.apply
       end
 
       it "should not give a checksum deprecation warning when no content is specified while checksum and checksum value are used" do
-        expect(Puppet).not_to receive(:puppet_deprecation_warning)
+        Puppet.expects(:puppet_deprecation_warning).never
         d = digest("this is some content")
         catalog.add_resource described_class.new(:path => path, :checksum => digest_algorithm, :checksum_value => d)
         catalog.apply
@@ -1281,7 +1282,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
 
   describe "when sourcing" do
     it "should give a deprecation warning when the user sets source_permissions" do
-      expect(Puppet).to receive(:puppet_deprecation_warning).with(
+      Puppet.expects(:puppet_deprecation_warning).with(
         'The `source_permissions` parameter is deprecated. Explicitly set `owner`, `group`, and `mode`.',
         {:file => 'my/file.pp', :line => 5})
 
@@ -1290,7 +1291,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
     end
 
     it "should not give a deprecation warning when the user does not set source_permissions" do
-      expect(Puppet).not_to receive(:puppet_deprecation_warning)
+      Puppet.expects(:puppet_deprecation_warning).never
       catalog.add_resource described_class.new(:path => path, :content => 'this is content')
       catalog.apply
     end
@@ -1524,6 +1525,15 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
               catalog.apply
             end
 
+            it "should not allow the user to explicitly set the mode to 4 ,and correct to 7" do
+              system_aces = get_aces_for_path_by_sid(path, @sids[:system])
+              expect(system_aces).not_to be_empty
+
+              system_aces.each do |ace|
+                expect(ace.mask).to eq(Puppet::Util::Windows::File::FILE_ALL_ACCESS)
+              end
+            end
+
             it "prepends SYSTEM ace when changing group from system to power users" do
               @file[:group] = @sids[:power_users]
               catalog.apply
@@ -1602,6 +1612,16 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
                 catalog.apply
               end
 
+              it "should not allow the user to explicitly set the mode to 4, and correct to 7" do
+                system_aces = get_aces_for_path_by_sid(dir, @sids[:system])
+                expect(system_aces).not_to be_empty
+
+                system_aces.each do |ace|
+                  # unlike files, Puppet sets execute bit on directories that are readable
+                  expect(ace.mask).to eq(Puppet::Util::Windows::File::FILE_ALL_ACCESS)
+                end
+              end
+
               it "prepends SYSTEM ace when changing group from system to power users" do
                 @directory[:group] = @sids[:power_users]
                 catalog.apply
@@ -1682,7 +1702,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
   describe "when using validate_cmd" do
     it "should fail the file resource if command fails" do
       catalog.add_resource(described_class.new(:path => path, :content => "foo", :validate_cmd => "/usr/bin/env false"))
-      expect(Puppet::Util::Execution).to receive(:execute).with("/usr/bin/env false", {:combine => true, :failonfail => true}).and_raise(Puppet::ExecutionFailure, "Failed")
+      Puppet::Util::Execution.expects(:execute).with("/usr/bin/env false", {:combine => true, :failonfail => true}).raises(Puppet::ExecutionFailure, "Failed")
       report = catalog.apply.report
       expect(report.resource_statuses["File[#{path}]"]).to be_failed
       expect(Puppet::FileSystem.exist?(path)).to be_falsey
@@ -1690,9 +1710,9 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
 
     it "should succeed the file resource if command succeeds" do
       catalog.add_resource(described_class.new(:path => path, :content => "foo", :validate_cmd => "/usr/bin/env true"))
-      expect(Puppet::Util::Execution).to receive(:execute)
+      Puppet::Util::Execution.expects(:execute)
         .with("/usr/bin/env true", {:combine => true, :failonfail => true})
-        .and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
+        .returns Puppet::Util::Execution::ProcessOutput.new('', 0)
       report = catalog.apply.report
       expect(report.resource_statuses["File[#{path}]"]).not_to be_failed
       expect(Puppet::FileSystem.exist?(path)).to be_truthy

data/spec/integration/type/package_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe Puppet::Type.type(:package), "when choosing a default package provider" do
@@ -63,8 +64,8 @@ end
 
 describe Puppet::Type.type(:package), "when packages with the same name are sourced" do
   before :each do
-    allow(Process).to receive(:euid).and_return(0)
-    @provider = double(
+    Process.stubs(:euid).returns 0
+    @provider = stub(
       'provider',
       :class           => Puppet::Type.type(:package).defaultprovider,
       :clear           => nil,
@@ -72,8 +73,8 @@ describe Puppet::Type.type(:package), "when packages with the same name are sour
       :name            => :mock,
       :validate_source => nil
     )
-    allow(Puppet::Type.type(:package).defaultprovider).to receive(:new).and_return(@provider)
-    allow(Puppet::Type.type(:package).defaultprovider).to receive(:instances).and_return([])
+    Puppet::Type.type(:package).defaultprovider.stubs(:new).returns(@provider)
+    Puppet::Type.type(:package).defaultprovider.stubs(:instances).returns([])
     @package = Puppet::Type.type(:package).new(:name => "yay", :ensure => :present)
 
     @catalog = Puppet::Resource::Catalog.new
@@ -100,7 +101,7 @@ describe Puppet::Type.type(:package), "when packages with the same name are sour
       provider_name = Puppet::Type.type(:package).defaultprovider.name
       expect {
         @catalog.add_resource(@alt_package)
-      }.to raise_error ArgumentError, "Cannot alias Package[gem-yay] to [nil, \"yay\", :#{provider_name}]; resource [\"Package\", nil, \"yay\", :#{provider_name}] already declared"
+      }.to raise_error ArgumentError, "Cannot alias Package[gem-yay] to [\"yay\", :#{provider_name}]; resource [\"Package\", \"yay\", :#{provider_name}] already declared"
     end
   end
 
@@ -116,18 +117,18 @@ describe Puppet::Type.type(:package), "when packages with the same name are sour
     describe "when it should be present" do
       [:present, :latest, "1.0"].each do |state|
         it "should do nothing if it is #{state.to_s}" do
-          expect(@provider).to receive(:properties).and_return(:ensure => state).at_least(:once)
-          expect(@alt_provider).to receive(:properties).and_return(:ensure => state).at_least(:once)
+          @provider.expects(:properties).returns(:ensure => state).at_least_once
+          @alt_provider.expects(:properties).returns(:ensure => state).at_least_once
           @catalog.apply
         end
       end
 
       [:purged, :absent].each do |state|
         it "should install if it is #{state.to_s}" do
-          allow(@provider).to receive(:properties).and_return(:ensure => state)
-          expect(@provider).to receive(:install)
-          allow(@alt_provider).to receive(:properties).and_return(:ensure => state)
-          expect(@alt_provider).to receive(:install)
+          @provider.stubs(:properties).returns(:ensure => state)
+          @provider.expects(:install)
+          @alt_provider.stubs(:properties).returns(:ensure => state)
+          @alt_provider.expects(:install)
           @catalog.apply
         end
       end
@@ -136,17 +137,18 @@ describe Puppet::Type.type(:package), "when packages with the same name are sour
 end
 
 describe Puppet::Type.type(:package), 'logging package state transitions' do
+
   let(:catalog) { Puppet::Resource::Catalog.new }
-  let(:provider) { double('provider', :class => Puppet::Type.type(:package).defaultprovider, :clear => nil, :validate_source => nil) }
+  let(:provider) { stub('provider', :class => Puppet::Type.type(:package).defaultprovider, :clear => nil, :validate_source => nil) }
 
   before :each do
-    allow(Process).to receive(:euid).and_return(0)
-    allow(provider).to receive(:satisfies?).with([:purgeable]).and_return(true)
-    allow(provider.class).to receive(:instances).and_return([])
-    allow(provider).to receive(:install).and_return(nil)
-    allow(provider).to receive(:uninstall).and_return(nil)
-    allow(provider).to receive(:purge).and_return(nil)
-    allow(Puppet::Type.type(:package).defaultprovider).to receive(:new).and_return(provider)
+    Process.stubs(:euid).returns 0
+    provider.stubs(:satisfies?).with([:purgeable]).returns(true)
+    provider.class.stubs(:instances).returns([])
+    provider.stubs(:install).returns nil
+    provider.stubs(:uninstall).returns nil
+    provider.stubs(:purge).returns nil
+    Puppet::Type.type(:package).defaultprovider.stubs(:new).returns(provider)
   end
 
   after :each do
@@ -177,8 +179,9 @@ describe Puppet::Type.type(:package), 'logging package state transitions' do
 
   states.each do |old, new_states|
     describe "#{old} package" do
+
       before :each do
-        allow(provider).to receive(:properties).and_return(:ensure => old)
+        provider.stubs(:properties).returns(:ensure => old)
       end
 
       new_states.each do |new, status|
@@ -198,3 +201,4 @@ describe Puppet::Type.type(:package), 'logging package state transitions' do
     end
   end
 end
+

data/spec/integration/type/tidy_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet_spec/compiler'
@@ -9,7 +10,7 @@ describe Puppet::Type.type(:tidy) do
   include PuppetSpec::Compiler
 
   before do
-    allow(Puppet::Util::Storage).to receive(:store)
+    Puppet::Util::Storage.stubs(:store)
   end
 
   it "should be able to recursively remove directories" do

data/spec/integration/type_spec.rb

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

data/spec/integration/util/autoload_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/util/autoload'
@@ -83,7 +84,7 @@ describe Puppet::Util::Autoload do
 
   it "should be able to load files directly from modules" do
     ## modulepath can't be used until after app settings are initialized, so we need to simulate that:
-    expect(Puppet.settings).to receive(:app_defaults_initialized?).and_return(true).at_least(:once)
+    Puppet.settings.expects(:app_defaults_initialized?).returns(true).at_least_once
 
     modulepath = tmpfile("autoload_module_testing")
     libdir = File.join(modulepath, "mymod", "lib", "foo")

data/spec/integration/util/rdoc/parser_spec.rb

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

data/spec/integration/util/settings_spec.rb

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

data/spec/integration/util/windows/adsi_spec.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/util/windows'
 
@@ -69,6 +70,7 @@ describe Puppet::Util::Windows::ADSI::Group,
         original_codepage = Encoding.default_external
         Encoding.default_external = Encoding::CP850 # Western Europe
 
+
         Puppet::Util::Windows::ADSI::Group.each do |group|
           expect(group.name.encoding).to be(Encoding::UTF_8)
         end
@@ -133,13 +135,13 @@ describe Puppet::Util::Windows::ADSI::Group,
     it 'should return a list of Principal objects even with unresolvable SIDs' do
       members = [
         # NULL SID is not localized
-        double('WIN32OLE', {
+        stub('WIN32OLE', {
           :objectSID => [1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
           :Name => 'NULL SID',
           :ole_respond_to? => true,
         }),
         # unresolvable SID is a different story altogether
-        double('WIN32OLE', {
+        stub('WIN32OLE', {
           # completely valid SID, but Name is just a stringified version
           :objectSID => [1, 5, 0, 0, 0, 0, 0, 5, 21, 0, 0, 0, 5, 113, 65, 218, 15, 127, 9, 57, 219, 4, 84, 126, 88, 4, 0, 0],
           :Name => 'S-1-5-21-3661721861-956923663-2119435483-1112',
@@ -152,7 +154,7 @@ describe Puppet::Util::Windows::ADSI::Group,
 
       # touch the native_object member to have it lazily loaded, so COM objects can be stubbed
       admins.native_object
-      allow(admins.native_object).to receive(:Members).and_return(members)
+      admins.native_object.stubs(:Members).returns(members)
 
       # well-known NULL SID
       expect(admins.members[0].sid).to eq('S-1-0-0')