puppet 6.25.0-x64-mingw32 → 7.0.0-x64-mingw32

data/spec/unit/util/posix_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 
-require 'puppet/ffi/posix'
 require 'puppet/util/posix'
 
 class PosixTest
@@ -12,344 +11,35 @@ describe Puppet::Util::POSIX do
     @posix = PosixTest.new
   end
 
-  describe '.groups_of' do 
-    let(:mock_user_data) { double(user, :gid => 1000) }
-
-    let(:ngroups_ptr) { double('FFI::MemoryPointer', :address => 0x0001, :size => 4) }
-    let(:groups_ptr) { double('FFI::MemoryPointer', :address => 0x0002, :size => Puppet::FFI::POSIX::Constants::MAXIMUM_NUMBER_OF_GROUPS) }
-
+  describe '.groups_of' do
     let(:mock_groups) do
       [
-        ['root', ['root'], 0],
-        ['nomembers', [], 5 ],
-        ['group1', ['user1', 'user2'], 1001],
-        ['group2', ['user2'], 2002],
-        ['group1', ['user1', 'user2'], 1001],
-        ['group3', ['user1'], 3003],
-        ['group4', ['user2'], 4004],
-        ['user1', [], 1111],
-        ['user2', [], 2222]
-      ].map do |(name, members, gid)|
+        ['group1', ['user1', 'user2']],
+        ['group2', ['user2']],
+        ['group1', ['user1', 'user2']],
+        ['group3', ['user1']],
+        ['group4', ['user2']]
+      ].map do |(name, members)|
         group_struct = double("Group #{name}")
         allow(group_struct).to receive(:name).and_return(name)
         allow(group_struct).to receive(:mem).and_return(members)
-        allow(group_struct).to receive(:gid).and_return(gid)
 
         group_struct
       end
     end
 
-    def prepare_user_and_groups_env(user, groups)
-      groups_gids = []
-      groups_and_user = []
-      groups_and_user.replace(groups)
-      groups_and_user.push(user)
-
-      groups_and_user.each do |group|
-        mock_group = mock_groups.find { |m| m.name == group }
-        groups_gids.push(mock_group.gid)
-
-        allow(Puppet::Etc).to receive(:getgrgid).with(mock_group.gid).and_return(mock_group)
-      end
-
-      if groups_and_user.size > Puppet::FFI::POSIX::Constants::MAXIMUM_NUMBER_OF_GROUPS
-        allow(ngroups_ptr).to receive(:read_int).and_return(Puppet::FFI::POSIX::Constants::MAXIMUM_NUMBER_OF_GROUPS, groups_and_user.size)
-      else
-        allow(ngroups_ptr).to receive(:read_int).and_return(groups_and_user.size)
-      end
-
-      allow(groups_ptr).to receive(:get_array_of_uint).with(0, groups_and_user.size).and_return(groups_gids)
-      allow(Puppet::Etc).to receive(:getpwnam).with(user).and_return(mock_user_data)
-    end
-
     before(:each) do
-      allow(Puppet::FFI::POSIX::Functions).to receive(:respond_to?).with(:getgrouplist, any_args).and_return(true)
-    end
-
-    describe 'when it uses FFI function getgrouplist' do
-      before(:each) do
-        allow(FFI::MemoryPointer).to receive(:new).with(:int).and_yield(ngroups_ptr)
-        allow(FFI::MemoryPointer).to receive(:new).with(:uint, Puppet::FFI::POSIX::Constants::MAXIMUM_NUMBER_OF_GROUPS).and_yield(groups_ptr)
-        allow(ngroups_ptr).to receive(:write_int).with(Puppet::FFI::POSIX::Constants::MAXIMUM_NUMBER_OF_GROUPS).and_return(ngroups_ptr)
-      end
-
-      describe 'when there are groups' do
-        context 'for user1' do
-          let(:user) { 'user1' }
-          let(:expected_groups) { ['group1', 'group3'] }
-
-          before(:each) do
-            prepare_user_and_groups_env(user, expected_groups)
-            allow(Puppet::FFI::POSIX::Functions).to receive(:getgrouplist).and_return(1)
-          end
-
-          it "should return the groups for given user" do
-            expect(Puppet::Util::POSIX.groups_of(user)).to eql(expected_groups)
-          end
-
-          it 'should not print any debug message about falling back to Puppet::Etc.group' do
-            expect(Puppet).not_to receive(:debug).with(/Falling back to Puppet::Etc.group:/)
-            Puppet::Util::POSIX.groups_of(user)
-          end
-        end
-
-        context 'for user2' do
-          let(:user) { 'user2' }
-          let(:expected_groups) { ['group1', 'group2', 'group4'] }
-
-          before(:each) do
-            prepare_user_and_groups_env(user, expected_groups)
-            allow(Puppet::FFI::POSIX::Functions).to receive(:respond_to?).with(:getgrouplist, any_args).and_return(true)
-            allow(Puppet::FFI::POSIX::Functions).to receive(:getgrouplist).and_return(1)
-          end
-
-          it "should return the groups for given user" do
-            expect(Puppet::Util::POSIX.groups_of(user)).to eql(expected_groups)
-          end
-
-          it 'should not print any debug message about falling back to Puppet::Etc.group' do
-            expect(Puppet).not_to receive(:debug).with(/Falling back to Puppet::Etc.group:/)
-            Puppet::Util::POSIX.groups_of(user)
-          end
-        end
-      end
-
-      describe 'when there are no groups' do
-        let(:user) { 'nomembers' }
-        let(:expected_groups) { [] }
-
-        before(:each) do
-          prepare_user_and_groups_env(user, expected_groups)
-          allow(Puppet::FFI::POSIX::Functions).to receive(:respond_to?).with(:getgrouplist, any_args).and_return(true)
-          allow(Puppet::FFI::POSIX::Functions).to receive(:getgrouplist).and_return(1)
-        end
-
-        it "should return no groups for given user" do
-          expect(Puppet::Util::POSIX.groups_of(user)).to eql(expected_groups)
-        end
-
-        it 'should not print any debug message about falling back to Puppet::Etc.group' do
-          expect(Puppet).not_to receive(:debug).with(/Falling back to Puppet::Etc.group:/)
-          Puppet::Util::POSIX.groups_of(user)
-        end
-      end
-
-      describe 'when primary group explicitly contains user' do
-        let(:user) { 'root' }
-        let(:expected_groups) { ['root'] }
-
-        before(:each) do
-          prepare_user_and_groups_env(user, expected_groups)
-          allow(Puppet::FFI::POSIX::Functions).to receive(:respond_to?).with(:getgrouplist, any_args).and_return(true)
-          allow(Puppet::FFI::POSIX::Functions).to receive(:getgrouplist).and_return(1)
-        end
-
-        it "should return the groups, including primary group, for given user" do
-          expect(Puppet::Util::POSIX.groups_of(user)).to eql(expected_groups)
-        end
-
-        it 'should not print any debug message about falling back to Puppet::Etc.group' do
-          expect(Puppet).not_to receive(:debug).with(/Falling back to Puppet::Etc.group:/)
-          Puppet::Util::POSIX.groups_of(user)
-        end
-      end
-
-      describe 'when primary group does not explicitly contain user' do
-        let(:user) { 'user1' }
-        let(:expected_groups) { ['group1', 'group3'] }
-
-        before(:each) do
-          prepare_user_and_groups_env(user, expected_groups)
-          allow(Puppet::FFI::POSIX::Functions).to receive(:respond_to?).with(:getgrouplist, any_args).and_return(true)
-          allow(Puppet::FFI::POSIX::Functions).to receive(:getgrouplist).and_return(1)
-        end
-
-        it "should not return primary group for given user" do
-          expect(Puppet::Util::POSIX.groups_of(user)).not_to include(user)
-        end
-
-        it 'should not print any debug message about falling back to Puppet::Etc.group' do
-          expect(Puppet).not_to receive(:debug).with(/Falling back to Puppet::Etc.group:/)
-          Puppet::Util::POSIX.groups_of(user)
-        end
-      end
-
-      context 'number of groups' do
-        before(:each) do
-          stub_const("Puppet::FFI::POSIX::Constants::MAXIMUM_NUMBER_OF_GROUPS", 2)
-          prepare_user_and_groups_env(user, expected_groups)
-
-          allow(FFI::MemoryPointer).to receive(:new).with(:uint, Puppet::FFI::POSIX::Constants::MAXIMUM_NUMBER_OF_GROUPS).and_yield(groups_ptr)
-          allow(ngroups_ptr).to receive(:write_int).with(Puppet::FFI::POSIX::Constants::MAXIMUM_NUMBER_OF_GROUPS).and_return(ngroups_ptr)
-        end
-
-        describe 'when there are less than maximum expected number of groups' do
-          let(:user) { 'root' }
-          let(:expected_groups) { ['root'] }
-
-          before(:each) do
-            allow(Puppet::FFI::POSIX::Functions).to receive(:respond_to?).with(:getgrouplist, any_args).and_return(true)
-            allow(Puppet::FFI::POSIX::Functions).to receive(:getgrouplist).and_return(1)
-          end
-
-          it "should return the groups for given user, after one 'getgrouplist' call" do
-            expect(Puppet::FFI::POSIX::Functions).to receive(:getgrouplist).once
-            expect(Puppet::Util::POSIX.groups_of(user)).to eql(expected_groups)
-          end
-
-          it 'should not print any debug message about falling back to Puppet::Etc.group' do
-            expect(Puppet).not_to receive(:debug).with(/Falling back to Puppet::Etc.group:/)
-            Puppet::Util::POSIX.groups_of(user)
-          end
-        end
-
-        describe 'when there are more than maximum expected number of groups' do
-          let(:user) { 'user1' }
-          let(:expected_groups) { ['group1', 'group3'] }
-
-          before(:each) do
-            allow(FFI::MemoryPointer).to receive(:new).with(:uint, Puppet::FFI::POSIX::Constants::MAXIMUM_NUMBER_OF_GROUPS * 2).and_yield(groups_ptr)
-            allow(ngroups_ptr).to receive(:write_int).with(Puppet::FFI::POSIX::Constants::MAXIMUM_NUMBER_OF_GROUPS * 2).and_return(ngroups_ptr)
-
-            allow(Puppet::FFI::POSIX::Functions).to receive(:respond_to?).with(:getgrouplist, any_args).and_return(true)
-            allow(Puppet::FFI::POSIX::Functions).to receive(:getgrouplist).and_return(-1, 1)
-          end
-
-          it "should return the groups for given user, after two 'getgrouplist' calls" do
-            expect(Puppet::FFI::POSIX::Functions).to receive(:getgrouplist).twice
-            expect(Puppet::Util::POSIX.groups_of(user)).to eql(expected_groups)
-          end
-
-          it 'should not print any debug message about falling back to Puppet::Etc.group' do
-            expect(Puppet).not_to receive(:debug).with(/Falling back to Puppet::Etc.group:/)
-            Puppet::Util::POSIX.groups_of(user)
-          end
-        end
+      etc_stub = receive(:group)
+      mock_groups.each do |mock_group|
+        etc_stub = etc_stub.and_yield(mock_group)
       end
+      allow(Puppet::Etc).to etc_stub
     end
 
-    describe 'when it falls back to Puppet::Etc.group method' do
-      before(:each) do
-        etc_stub = receive(:group)
-        mock_groups.each do |mock_group|
-          etc_stub = etc_stub.and_yield(mock_group)
-        end
-        allow(Puppet::Etc).to etc_stub
-
-        allow(Puppet::Etc).to receive(:getpwnam).with(user).and_raise(ArgumentError, "can't find user for #{user}")
-        allow(Puppet).to receive(:debug)
-
-        allow(Puppet::FFI::POSIX::Functions).to receive(:respond_to?).with(:getgrouplist, any_args).and_return(false)
-      end
-
-      describe 'when there are groups' do
-        context 'for user1' do
-          let(:user) { 'user1' }
-          let(:expected_groups) { ['group1', 'group3'] }
-
-          it "should return the groups for given user" do
-            expect(Puppet::Util::POSIX.groups_of(user)).to eql(expected_groups)
-          end
-
-          it 'logs a debug message' do
-            expect(Puppet).to receive(:debug).with("Falling back to Puppet::Etc.group: The 'getgrouplist' method is not available")
-            Puppet::Util::POSIX.groups_of(user)
-          end
-        end
-
-        context 'for user2' do
-          let(:user) { 'user2' }
-          let(:expected_groups) { ['group1', 'group2', 'group4'] }
-
-          it "should return the groups for given user" do
-            expect(Puppet::Util::POSIX.groups_of(user)).to eql(expected_groups)
-          end
-
-          it 'logs a debug message' do
-            expect(Puppet).to receive(:debug).with("Falling back to Puppet::Etc.group: The 'getgrouplist' method is not available")
-            Puppet::Util::POSIX.groups_of(user)
-          end
-        end
-      end
-
-      describe 'when there are no groups' do
-        let(:user) { 'nomembers' }
-        let(:expected_groups) { [] }
-
-        it "should return no groups for given user" do
-          expect(Puppet::Util::POSIX.groups_of(user)).to eql(expected_groups)
-        end
-
-        it 'logs a debug message' do
-          expect(Puppet).to receive(:debug).with("Falling back to Puppet::Etc.group: The 'getgrouplist' method is not available")
-          Puppet::Util::POSIX.groups_of(user)
-        end
-      end
-
-      describe 'when primary group explicitly contains user' do
-        let(:user) { 'root' }
-        let(:expected_groups) { ['root'] }
-
-        it "should return the groups, including primary group, for given user" do
-          expect(Puppet::Util::POSIX.groups_of(user)).to eql(expected_groups)
-        end
-
-        it 'logs a debug message' do
-          expect(Puppet).to receive(:debug).with("Falling back to Puppet::Etc.group: The 'getgrouplist' method is not available")
-          Puppet::Util::POSIX.groups_of(user)
-        end
-      end
-
-      describe 'when primary group does not explicitly contain user' do
-        let(:user) { 'user1' }
-        let(:expected_groups) { ['group1', 'group3'] }
-
-        it "should not return primary group for given user" do
-          expect(Puppet::Util::POSIX.groups_of(user)).not_to include(user)
-        end
-
-        it 'logs a debug message' do
-          expect(Puppet).to receive(:debug).with("Falling back to Puppet::Etc.group: The 'getgrouplist' method is not available")
-          Puppet::Util::POSIX.groups_of(user)
-        end
-      end
-
-      describe "when the 'getgrouplist' method is not available" do
-        let(:user) { 'user1' }
-        let(:expected_groups) { ['group1', 'group3'] }
-
-        before(:each) do
-          allow(Puppet::FFI::POSIX::Functions).to receive(:respond_to?).with(:getgrouplist).and_return(false)
-        end
-
-        it "should return the groups" do
-          expect(Puppet::Util::POSIX.groups_of(user)).to eql(expected_groups)
-        end
-
-        it 'logs a debug message' do
-          expect(Puppet).to receive(:debug).with("Falling back to Puppet::Etc.group: The 'getgrouplist' method is not available")
-          Puppet::Util::POSIX.groups_of(user)
-        end
-      end
-
-
-      describe "when ffi is not available on the machine" do
-        let(:user) { 'user1' }
-        let(:expected_groups) { ['group1', 'group3'] }
-
-        before(:each) do
-          allow(Puppet::Util::POSIX).to receive(:require).with('puppet/ffi/posix').and_raise(LoadError, 'cannot load such file -- ffi')
-        end
-
-        it "should return the groups" do
-          expect(Puppet::Util::POSIX.groups_of(user)).to eql(expected_groups)
-        end
-
-        it 'logs a debug message' do
-          expect(Puppet).to receive(:debug).with("Falling back to Puppet::Etc.group: cannot load such file -- ffi")
-          Puppet::Util::POSIX.groups_of(user)
-        end
-      end
+    it 'returns the groups of the given user' do
+      expect(Puppet::Util::POSIX.groups_of('user1')).to eql(
+        ['group1', 'group3']
+      )
     end
   end
 
@@ -499,25 +189,6 @@ describe Puppet::Util::POSIX do
         expect(@posix.gid("asdf")).to eq(100)
       end
 
-      it "returns the id without full groups query if multiple groups have the same id" do
-        expect(@posix).to receive(:get_posix_field).with(:group, :gid, "asdf").and_return(100)
-        expect(@posix).to receive(:get_posix_field).with(:group, :name, 100).and_return("boo")
-        expect(@posix).to receive(:get_posix_field).with(:group, :gid, "boo").and_return(100)
-
-        expect(@posix).not_to receive(:search_posix_field)
-        expect(@posix.gid("asdf")).to eq(100)
-      end
-
-      it "returns the id with full groups query if name is nil" do
-        expect(@posix).to receive(:get_posix_field).with(:group, :gid, "asdf").and_return(100)
-        expect(@posix).to receive(:get_posix_field).with(:group, :name, 100).and_return(nil)
-        expect(@posix).not_to receive(:get_posix_field).with(:group, :gid, nil)
-
-
-        expect(@posix).to receive(:search_posix_field).with(:group, :gid, "asdf").and_return(100)
-        expect(@posix.gid("asdf")).to eq(100)
-      end
-
       it "should use :search_posix_field if the discovered name does not match the passed-in name" do
         expect(@posix).to receive(:get_posix_field).with(:group, :gid, "asdf").and_return(100)
         expect(@posix).to receive(:get_posix_field).with(:group, :name, 100).and_return("boo")
@@ -594,25 +265,6 @@ describe Puppet::Util::POSIX do
         expect(@posix.uid("asdf")).to eq(100)
       end
 
-      it "returns the id without full users query if multiple users have the same id" do
-        expect(@posix).to receive(:get_posix_field).with(:passwd, :uid, "asdf").and_return(100)
-        expect(@posix).to receive(:get_posix_field).with(:passwd, :name, 100).and_return("boo")
-        expect(@posix).to receive(:get_posix_field).with(:passwd, :uid, "boo").and_return(100)
-
-        expect(@posix).not_to receive(:search_posix_field)
-        expect(@posix.uid("asdf")).to eq(100)
-      end
-
-      it "returns the id with full users query if name is nil" do
-        expect(@posix).to receive(:get_posix_field).with(:passwd, :uid, "asdf").and_return(100)
-        expect(@posix).to receive(:get_posix_field).with(:passwd, :name, 100).and_return(nil)
-        expect(@posix).not_to receive(:get_posix_field).with(:passwd, :uid, nil)
-
-
-        expect(@posix).to receive(:search_posix_field).with(:passwd, :uid, "asdf").and_return(100)
-        expect(@posix.uid("asdf")).to eq(100)
-      end
-
       it "should use :search_posix_field if the discovered name does not match the passed-in name" do
         expect(@posix).to receive(:get_posix_field).with(:passwd, :uid, "asdf").and_return(100)
         expect(@posix).to receive(:get_posix_field).with(:passwd, :name, 100).and_return("boo")

data/spec/unit/util/run_mode_spec.rb

@@ -1,12 +1,6 @@
 require 'spec_helper'
 
 describe Puppet::Util::RunMode do
-  # Discriminator for tests that attempts to unset HOME since that, for reasons currently unknown,
-  # doesn't work in Ruby >= 2.4.0
-  def self.gte_ruby_2_4
-    @gte_ruby_2_4 ||= SemanticPuppet::Version.parse(RUBY_VERSION) >= SemanticPuppet::Version.parse('2.4.0')
-  end
-
   before do
     @run_mode = Puppet::Util::RunMode.new('fake')
   end
@@ -34,14 +28,6 @@ describe Puppet::Util::RunMode do
           as_non_root { expect(@run_mode.conf_dir).to eq(File.expand_path('~/.puppetlabs/etc/puppet')) }
         end
       end
-
-      it "fails when asking for the conf_dir as non-root and there is no $HOME", :unless => gte_ruby_2_4 || Puppet::Util::Platform.windows? do
-        as_non_root do
-          without_home do
-            expect { @run_mode.conf_dir }.to raise_error ArgumentError, /couldn't find HOME/
-          end
-        end
-      end
     end
 
     describe "#code_dir" do
@@ -62,14 +48,6 @@ describe Puppet::Util::RunMode do
           as_non_root { expect(@run_mode.code_dir).to eq(File.expand_path('~/.puppetlabs/etc/code')) }
         end
       end
-
-      it "fails when asking for the code_dir as non-root and there is no $HOME", :unless => gte_ruby_2_4 || Puppet::Util::Platform.windows? do
-        as_non_root do
-          without_home do
-            expect { @run_mode.code_dir }.to raise_error ArgumentError, /couldn't find HOME/
-          end
-        end
-      end
     end
 
     describe "#var_dir" do
@@ -80,13 +58,15 @@ describe Puppet::Util::RunMode do
       it "has vardir ~/.puppetlabs/opt/puppet/cache when run as non-root" do
         as_non_root { expect(@run_mode.var_dir).to eq(File.expand_path('~/.puppetlabs/opt/puppet/cache')) }
       end
+    end
+
+    describe "#public_dir" do
+      it "has publicdir /opt/puppetlabs/puppet/public when run as root" do
+        as_root { expect(@run_mode.public_dir).to eq(File.expand_path('/opt/puppetlabs/puppet/public')) }
+      end
 
-      it "fails when asking for the var_dir as non-root and there is no $HOME", :unless => gte_ruby_2_4 || Puppet::Util::Platform.windows? do
-        as_non_root do
-          without_home do
-            expect { @run_mode.var_dir }.to raise_error ArgumentError, /couldn't find HOME/
-          end
-        end
+      it "has publicdir ~/.puppetlabs/opt/puppet/public when run as non-root" do
+        as_non_root { expect(@run_mode.public_dir).to eq(File.expand_path('~/.puppetlabs/opt/puppet/public')) }
       end
     end
 
@@ -101,14 +81,6 @@ describe Puppet::Util::RunMode do
         it "has default logdir ~/.puppetlabs/var/log" do
           as_non_root { expect(@run_mode.log_dir).to eq(File.expand_path('~/.puppetlabs/var/log')) }
         end
-
-        it "fails when asking for the log_dir and there is no $HOME", :unless => gte_ruby_2_4 || Puppet::Util::Platform.windows? do
-          as_non_root do
-            without_home do
-              expect { @run_mode.log_dir }.to raise_error ArgumentError, /couldn't find HOME/
-            end
-          end
-        end
       end
     end
 
@@ -123,103 +95,59 @@ describe Puppet::Util::RunMode do
         it "has default rundir ~/.puppetlabs/var/run" do
           as_non_root { expect(@run_mode.run_dir).to eq(File.expand_path('~/.puppetlabs/var/run')) }
         end
-
-        it "fails when asking for the run_dir and there is no $HOME", :unless => gte_ruby_2_4 || Puppet::Util::Platform.windows? do
-          as_non_root do
-            without_home do
-              expect { @run_mode.run_dir }.to raise_error ArgumentError, /couldn't find HOME/
-            end
-          end
-        end
       end
     end
   end
 
   describe Puppet::Util::WindowsRunMode, :if => Puppet::Util::Platform.windows? do
     before do
-      if not Dir.const_defined? :COMMON_APPDATA
-        Dir.const_set :COMMON_APPDATA, "/CommonFakeBase"
-        @remove_const = true
-      end
       @run_mode = Puppet::Util::WindowsRunMode.new('fake')
     end
 
-    after do
-      if @remove_const
-        Dir.send :remove_const, :COMMON_APPDATA
-      end
-    end
-
     describe "#conf_dir" do
       it "has confdir ending in Puppetlabs/puppet/etc when run as root" do
-        as_root { expect(@run_mode.conf_dir).to eq(File.expand_path(File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "etc"))) }
+        as_root { expect(@run_mode.conf_dir).to eq(File.expand_path(File.join(ENV['ALLUSERSPROFILE'], "PuppetLabs", "puppet", "etc"))) }
       end
 
       it "has confdir in ~/.puppetlabs/etc/puppet when run as non-root" do
         as_non_root { expect(@run_mode.conf_dir).to eq(File.expand_path("~/.puppetlabs/etc/puppet")) }
       end
-
-      it "fails when asking for the conf_dir as non-root and there is no %HOME%, %HOMEDRIVE%, and %USERPROFILE%", :unless => gte_ruby_2_4 do
-        as_non_root do
-          without_env('HOME') do
-            without_env('HOMEDRIVE') do
-              without_env('USERPROFILE') do
-                expect { @run_mode.conf_dir }.to raise_error ArgumentError, /couldn't find HOME/
-              end
-            end
-          end
-        end
-      end
     end
 
     describe "#code_dir" do
       it "has codedir ending in PuppetLabs/code when run as root" do
-        as_root { expect(@run_mode.code_dir).to eq(File.expand_path(File.join(Dir::COMMON_APPDATA, "PuppetLabs", "code"))) }
+        as_root { expect(@run_mode.code_dir).to eq(File.expand_path(File.join(ENV['ALLUSERSPROFILE'], "PuppetLabs", "code"))) }
       end
 
       it "has codedir in ~/.puppetlabs/etc/code when run as non-root" do
         as_non_root { expect(@run_mode.code_dir).to eq(File.expand_path("~/.puppetlabs/etc/code")) }
       end
-
-      it "fails when asking for the code_dir as non-root and there is no %HOME%, %HOMEDRIVE%, and %USERPROFILE%", :unless => gte_ruby_2_4 do
-        as_non_root do
-          without_env('HOME') do
-            without_env('HOMEDRIVE') do
-              without_env('USERPROFILE') do
-                expect { @run_mode.code_dir }.to raise_error ArgumentError, /couldn't find HOME/
-              end
-            end
-          end
-        end
-      end
     end
 
     describe "#var_dir" do
       it "has vardir ending in PuppetLabs/puppet/cache when run as root" do
-        as_root { expect(@run_mode.var_dir).to eq(File.expand_path(File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "cache"))) }
+        as_root { expect(@run_mode.var_dir).to eq(File.expand_path(File.join(ENV['ALLUSERSPROFILE'], "PuppetLabs", "puppet", "cache"))) }
       end
 
       it "has vardir in ~/.puppetlabs/opt/puppet/cache when run as non-root" do
         as_non_root { expect(@run_mode.var_dir).to eq(File.expand_path("~/.puppetlabs/opt/puppet/cache")) }
       end
+    end
+
+    describe "#public_dir" do
+      it "has publicdir ending in PuppetLabs/puppet/public when run as root" do
+        as_root { expect(@run_mode.public_dir).to eq(File.expand_path(File.join(ENV['ALLUSERSPROFILE'], "PuppetLabs", "puppet", "public"))) }
+      end
 
-      it "fails when asking for the conf_dir as non-root and there is no %HOME%, %HOMEDRIVE%, and %USERPROFILE%", :unless => gte_ruby_2_4 do
-        as_non_root do
-          without_env('HOME') do
-            without_env('HOMEDRIVE') do
-              without_env('USERPROFILE') do
-                expect { @run_mode.var_dir }.to raise_error ArgumentError, /couldn't find HOME/
-              end
-            end
-          end
-        end
+      it "has publicdir in ~/.puppetlabs/opt/puppet/public when run as non-root" do
+        as_non_root { expect(@run_mode.public_dir).to eq(File.expand_path("~/.puppetlabs/opt/puppet/public")) }
       end
     end
 
     describe "#log_dir" do
       describe "when run as root" do
         it "has logdir ending in PuppetLabs/puppet/var/log" do
-          as_root { expect(@run_mode.log_dir).to eq(File.expand_path(File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "var", "log"))) }
+          as_root { expect(@run_mode.log_dir).to eq(File.expand_path(File.join(ENV['ALLUSERSPROFILE'], "PuppetLabs", "puppet", "var", "log"))) }
         end
       end
 
@@ -227,25 +155,13 @@ describe Puppet::Util::RunMode do
         it "has default logdir ~/.puppetlabs/var/log" do
           as_non_root { expect(@run_mode.log_dir).to eq(File.expand_path('~/.puppetlabs/var/log')) }
         end
-
-        it "fails when asking for the log_dir and there is no $HOME", :unless => gte_ruby_2_4 do
-          as_non_root do
-            without_env('HOME') do
-              without_env('HOMEDRIVE') do
-                without_env('USERPROFILE') do
-                  expect { @run_mode.log_dir }.to raise_error ArgumentError, /couldn't find HOME/
-                end
-              end
-            end
-          end
-        end
       end
     end
 
     describe "#run_dir" do
       describe "when run as root" do
         it "has rundir ending in PuppetLabs/puppet/var/run" do
-          as_root { expect(@run_mode.run_dir).to eq(File.expand_path(File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "var", "run"))) }
+          as_root { expect(@run_mode.run_dir).to eq(File.expand_path(File.join(ENV['ALLUSERSPROFILE'], "PuppetLabs", "puppet", "var", "run"))) }
         end
       end
 
@@ -253,18 +169,6 @@ describe Puppet::Util::RunMode do
         it "has default rundir ~/.puppetlabs/var/run" do
           as_non_root { expect(@run_mode.run_dir).to eq(File.expand_path('~/.puppetlabs/var/run')) }
         end
-
-        it "fails when asking for the run_dir and there is no $HOME", :unless => gte_ruby_2_4 do
-          as_non_root do
-            without_env('HOME') do
-              without_env('HOMEDRIVE') do
-                without_env('USERPROFILE') do
-                  expect { @run_mode.run_dir }.to raise_error ArgumentError, /couldn't find HOME/
-                end
-              end
-            end
-          end
-        end
       end
     end
 
@@ -310,8 +214,4 @@ describe Puppet::Util::RunMode do
   ensure
     Puppet::Util.set_env(name, saved)
   end
-
-  def without_home(&block)
-    without_env('HOME', &block)
-  end
 end