puppet 7.28.0-x86-mingw32 → 8.0.1-x86-mingw32

data/spec/unit/pops/validator/validator_spec.rb

@@ -142,10 +142,9 @@ describe "validating 4x" do
   end
 
   context 'with the default settings for --strict' do
-    it 'produces a warning for duplicate keys in a literal hash' do
+    it 'produces an error for duplicate keys in a literal hash' do
       acceptor = validate(parse('{ a => 1, a => 2 }'))
-      expect(acceptor.warning_count).to eql(1)
-      expect(acceptor.error_count).to eql(0)
+      expect(acceptor.error_count).to eql(1)
       expect(acceptor).to have_issue(Puppet::Pops::Issues::DUPLICATE_KEY)
     end
 

data/spec/unit/provider/package/appdmg_spec.rb

@@ -11,7 +11,7 @@ describe Puppet::Type.type(:package).provider(:appdmg) do
     before do
       fh = double('filehandle', path: '/tmp/foo')
       resource[:source] = "foo.dmg"
-      allow(File).to receive(:open).and_yield(fh)
+      allow(described_class).to receive(:open).and_yield(fh)
       allow(Dir).to receive(:mktmpdir).and_return("/tmp/testtmp123")
       allow(FileUtils).to receive(:remove_entry_secure)
     end

data/spec/unit/provider/package/apt_spec.rb

@@ -14,8 +14,8 @@ describe Puppet::Type.type(:package).provider(:apt) do
     resource.provider
   end
 
-  it "should be the default provider on :osfamily => Debian" do
-    expect(Facter).to receive(:value).with(:osfamily).and_return("Debian")
+  it "should be the default provider on 'os.family' => Debian" do
+    expect(Facter).to receive(:value).with('os.family').and_return("Debian")
     expect(described_class.default?).to be_truthy
   end
 

data/spec/unit/provider/package/dnf_spec.rb

@@ -6,47 +6,40 @@ describe Puppet::Type.type(:package).provider(:dnf) do
   context 'default' do
     (19..21).each do |ver|
       it "should not be the default provider on fedora#{ver}" do
-        allow(Facter).to receive(:value).with(:osfamily).and_return(:redhat)
-        allow(Facter).to receive(:value).with(:operatingsystem).and_return(:fedora)
-        allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("#{ver}")
+        allow(Facter).to receive(:value).with('os.family').and_return(:redhat)
+        allow(Facter).to receive(:value).with('os.name').and_return(:fedora)
+        allow(Facter).to receive(:value).with('os.release.major').and_return("#{ver}")
         expect(described_class).to_not be_default
       end
     end
 
     (22..26).each do |ver|
       it "should be the default provider on fedora#{ver}" do
-        allow(Facter).to receive(:value).with(:osfamily).and_return(:redhat)
-        allow(Facter).to receive(:value).with(:operatingsystem).and_return(:fedora)
-        allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("#{ver}")
+        allow(Facter).to receive(:value).with('os.family').and_return(:redhat)
+        allow(Facter).to receive(:value).with('os.name').and_return(:fedora)
+        allow(Facter).to receive(:value).with('os.release.major').and_return("#{ver}")
         expect(described_class).to be_default
       end
     end
 
     it "should not be the default provider on rhel7" do
-      allow(Facter).to receive(:value).with(:osfamily).and_return(:redhat)
-      allow(Facter).to receive(:value).with(:operatingsystem).and_return(:redhat)
-      allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("7")
+      allow(Facter).to receive(:value).with('os.family').and_return(:redhat)
+      allow(Facter).to receive(:value).with('os.name').and_return(:redhat)
+      allow(Facter).to receive(:value).with('os.release.major').and_return("7")
       expect(described_class).to_not be_default
     end
 
     it "should be the default provider on some random future fedora" do
-      allow(Facter).to receive(:value).with(:osfamily).and_return(:redhat)
-      allow(Facter).to receive(:value).with(:operatingsystem).and_return(:fedora)
-      allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("8675")
+      allow(Facter).to receive(:value).with('os.family').and_return(:redhat)
+      allow(Facter).to receive(:value).with('os.name').and_return(:fedora)
+      allow(Facter).to receive(:value).with('os.release.major').and_return("8675")
       expect(described_class).to be_default
     end
 
     it "should be the default provider on rhel8" do
-      allow(Facter).to receive(:value).with(:osfamily).and_return(:redhat)
-      allow(Facter).to receive(:value).with(:operatingsystem).and_return(:redhat)
-      allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("8")
-      expect(described_class).to be_default
-    end
-
-    it "should be the default provider on Amazon Linux 2023" do
-      allow(Facter).to receive(:value).with(:osfamily).and_return(:redhat)
-      allow(Facter).to receive(:value).with(:operatingsystem).and_return(:amazon)
-      allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("2023")
+      allow(Facter).to receive(:value).with('os.family').and_return(:redhat)
+      allow(Facter).to receive(:value).with('os.name').and_return(:redhat)
+      allow(Facter).to receive(:value).with('os.release.major').and_return("8")
       expect(described_class).to be_default
     end
   end

data/spec/unit/provider/package/dnfmodule_spec.rb

@@ -24,18 +24,18 @@ describe Puppet::Type.type(:package).provider(:dnfmodule) do
   before(:each) { allow(Puppet::Util).to receive(:which).with('/usr/bin/dnf').and_return(dnf_path) }
 
   it "should have lower specificity" do
-    allow(Facter).to receive(:value).with(:osfamily).and_return(:redhat)
-    allow(Facter).to receive(:value).with(:operatingsystem).and_return(:redhat)
-    allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return('8')
+    allow(Facter).to receive(:value).with('os.family').and_return(:redhat)
+    allow(Facter).to receive(:value).with('os.name').and_return(:redhat)
+    allow(Facter).to receive(:value).with('os.release.major').and_return('8')
     expect(described_class.specificity).to be < 200
   end
 
   describe "should be an opt-in provider" do
     Array(4..8).each do |ver|
       it "should not be default for redhat #{ver}" do
-        allow(Facter).to receive(:value).with(:operatingsystem).and_return('redhat')
-        allow(Facter).to receive(:value).with(:osfamily).and_return('redhat')
-        allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return(ver.to_s)
+        allow(Facter).to receive(:value).with('os.name').and_return('redhat')
+        allow(Facter).to receive(:value).with('os.family').and_return('redhat')
+        allow(Facter).to receive(:value).with('os.release.major').and_return(ver.to_s)
         expect(described_class).not_to be_default
       end
     end
@@ -123,7 +123,7 @@ describe Puppet::Type.type(:package).provider(:dnfmodule) do
         provider.install
       end
 
-      it "should just enable the module if it has no default profile (missing groups or modules)" do
+      it "should just enable the module if it has no default profile(missing groups or modules)" do
         dnf_exception = Puppet::ExecutionFailure.new("Error: Problems in request:\nmissing groups or modules: #{resource[:name]}")
         allow(provider).to receive(:execute).with(array_including('install')).and_raise(dnf_exception)
         resource[:ensure] = :present
@@ -132,17 +132,7 @@ describe Puppet::Type.type(:package).provider(:dnfmodule) do
         provider.install
       end
 
-      it "should just enable the module with the right stream if it has no default profile (missing groups or modules)" do
-        stream = '12.3'
-        dnf_exception = Puppet::ExecutionFailure.new("Error: Problems in request:\nmissing groups or modules: #{resource[:name]}:#{stream}")
-        allow(provider).to receive(:execute).with(array_including('install')).and_raise(dnf_exception)
-        resource[:ensure] = stream
-        expect(provider).to receive(:execute).with(array_including('install')).ordered
-        expect(provider).to receive(:execute).with(array_including('enable')).ordered
-        provider.install
-      end
-
-      it "should just enable the module if it has no default profile (broken groups or modules)" do
+      it "should just enable the module if it has no default profile(broken groups or modules)" do
         dnf_exception = Puppet::ExecutionFailure.new("Error: Problems in request:\nbroken groups or modules: #{resource[:name]}")
         allow(provider).to receive(:execute).with(array_including('install')).and_raise(dnf_exception)
         resource[:ensure] = :present
@@ -151,16 +141,6 @@ describe Puppet::Type.type(:package).provider(:dnfmodule) do
         provider.install
       end
 
-      it "should just enable the module with the right stream if it has no default profile (broken groups or modules)" do
-        stream = '12.3'
-        dnf_exception = Puppet::ExecutionFailure.new("Error: Problems in request:\nbroken groups or modules: #{resource[:name]}:#{stream}")
-        allow(provider).to receive(:execute).with(array_including('install')).and_raise(dnf_exception)
-        resource[:ensure] = stream
-        expect(provider).to receive(:execute).with(array_including('install')).ordered
-        expect(provider).to receive(:execute).with(array_including('enable')).ordered
-        provider.install
-      end
-
       it "should just enable the module if enable_only = true" do
         resource[:ensure] = :present
         resource[:enable_only] = true

data/spec/unit/provider/package/gem_spec.rb

@@ -51,8 +51,8 @@ context Puppet::Type.type(:package).provider(:gem) do
 
         before do
           allow(Puppet::Util::Platform).to receive(:windows?).and_return(true)
-          allow(Puppet::Util).to receive(:get_env)
-          allow(Puppet::Util).to receive(:get_env).with('PATH').and_return(path)
+          allow(ENV).to receive(:[]).and_call_original
+          allow(ENV).to receive(:[]).with('PATH').and_return(path)
           allow(described_class).to receive(:validate_command).with(provider_gem_cmd)
           stub_const('::File::PATH_SEPARATOR', ';')
         end
@@ -476,9 +476,9 @@ context Puppet::Type.type(:package).provider(:gem) do
     end
 
     context 'when is defaultfor' do
-      let(:os) { Puppet.runtime[:facter].value(:operatingsystem) }
+      let(:os) { Puppet.runtime[:facter].value('os.name') }
       subject do
-        described_class.defaultfor(operatingsystem: os)
+        described_class.defaultfor('os.name': os)
         described_class.specificity
       end
       it { is_expected.to be > 100 }

data/spec/unit/provider/package/pip2_spec.rb

@@ -26,9 +26,9 @@ describe Puppet::Type.type(:package).provider(:pip2) do
     end
 
     context 'when is defaultfor' do
-      let(:os) { Puppet.runtime[:facter].value(:operatingsystem) }
+      let(:os) { Puppet.runtime[:facter].value('os.name') }
       subject do
-        described_class.defaultfor(operatingsystem: os)
+        described_class.defaultfor('os.name': os)
         described_class.specificity
       end
       it { is_expected.to be > 100 }

data/spec/unit/provider/package/pip3_spec.rb

@@ -26,9 +26,9 @@ describe Puppet::Type.type(:package).provider(:pip3) do
     end
 
     context 'when is defaultfor' do
-      let(:os) { Puppet.runtime[:facter].value(:operatingsystem) }
+      let(:os) { Puppet.runtime[:facter].value('os.name') }
       subject do
-        described_class.defaultfor(operatingsystem: os)
+        described_class.defaultfor('os.name': os)
         described_class.specificity
       end
       it { is_expected.to be > 100 }

data/spec/unit/provider/package/pip_spec.rb

@@ -493,9 +493,9 @@ describe Puppet::Type.type(:package).provider(:pip) do
     end
 
     context 'when is defaultfor' do
-      let(:os) { Puppet.runtime[:facter].value(:operatingsystem) }
+      let(:os) { Puppet.runtime[:facter].value('os.name') }
       subject do
-        described_class.defaultfor(operatingsystem: os)
+        described_class.defaultfor('os.name': os)
         described_class.specificity
       end
       it { is_expected.to be > 100 }

data/spec/unit/provider/package/pkg_spec.rb

@@ -21,20 +21,20 @@ describe Puppet::Type.type(:package).provider(:pkg), unless: Puppet::Util::Platf
   context 'default' do
     [ 10 ].each do |ver|
       it "should not be the default provider on Solaris #{ver}" do
-        allow(Facter).to receive(:value).with(:osfamily).and_return(:Solaris)
+        allow(Facter).to receive(:value).with('os.family').and_return(:Solaris)
         allow(Facter).to receive(:value).with(:kernelrelease).and_return("5.#{ver}")
-        allow(Facter).to receive(:value).with(:operatingsystem).and_return(:Solaris)
-        allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("#{ver}")
+        allow(Facter).to receive(:value).with('os.name').and_return(:Solaris)
+        allow(Facter).to receive(:value).with('os.release.major').and_return("#{ver}")
         expect(described_class).to_not be_default
       end
     end
 
     [ 11, 12 ].each do |ver|
       it "should be the default provider on Solaris #{ver}" do
-        allow(Facter).to receive(:value).with(:osfamily).and_return(:Solaris)
+        allow(Facter).to receive(:value).with('os.family').and_return(:Solaris)
         allow(Facter).to receive(:value).with(:kernelrelease).and_return("5.#{ver}")
-        allow(Facter).to receive(:value).with(:operatingsystem).and_return(:Solaris)
-        allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("#{ver}")
+        allow(Facter).to receive(:value).with('os.name').and_return(:Solaris)
+        allow(Facter).to receive(:value).with('os.release.major').and_return("#{ver}")
         expect(described_class).to be_default
       end
     end
@@ -240,9 +240,9 @@ describe Puppet::Type.type(:package).provider(:pkg), unless: Puppet::Util::Platf
         { :osrel => '11.0', :flags => ['--accept'] },
         { :osrel => '11.2', :flags => ['--accept', '--sync-actuators-timeout', '900'] },
       ].each do |hash|
-        context "with :operatingsystemrelease #{hash[:osrel]}" do
+        context "with 'os.release.full' #{hash[:osrel]}" do
           before :each do
-            allow(Facter).to receive(:value).with(:operatingsystemrelease).and_return(hash[:osrel])
+            allow(Facter).to receive(:value).with('os.release.full').and_return(hash[:osrel])
           end
 
           it "should support install options" do

data/spec/unit/provider/package/pkgng_spec.rb

@@ -220,7 +220,7 @@ describe Puppet::Type.type(:package).provider(:pkgng) do
   describe "confine" do
     context "on FreeBSD" do
       it "should be the default provider" do
-        expect(Facter).to receive(:value).with(:operatingsystem).at_least(:once).and_return(:freebsd)
+        expect(Facter).to receive(:value).with('os.name').at_least(:once).and_return(:freebsd)
         expect(described_class).to be_default
       end
     end

data/spec/unit/provider/package/portage_spec.rb

@@ -72,8 +72,8 @@ describe Puppet::Type.type(:package).provider(:portage) do
     expect(described_class).to be_reinstallable
   end
 
-  it "should be the default provider on :osfamily => Gentoo" do
-    expect(Facter).to receive(:value).with(:osfamily).and_return("Gentoo")
+  it "should be the default provider on 'os.family' => Gentoo" do
+    expect(Facter).to receive(:value).with('os.family').and_return("Gentoo")
     expect(described_class.default?).to be_truthy
   end
 

data/spec/unit/provider/package/puppet_gem_spec.rb

@@ -35,8 +35,8 @@ describe Puppet::Type.type(:package).provider(:puppet_gem) do
   describe '.windows_gemcmd' do
     context 'when PUPPET_DIR is not set' do
       before do
-        allow(Puppet::Util).to receive(:get_env).and_call_original
-        allow(Puppet::Util).to receive(:get_env).with('PUPPET_DIR').and_return(nil)
+        allow(ENV).to receive(:[]).and_call_original
+        allow(ENV).to receive(:[]).with('PUPPET_DIR').and_return(nil)
         allow(Gem).to receive(:default_bindir).and_return('default_gem_bin')
       end
 
@@ -48,8 +48,8 @@ describe Puppet::Type.type(:package).provider(:puppet_gem) do
 
     context 'when PUPPET_DIR is set' do
       before do
-        allow(Puppet::Util).to receive(:get_env).and_call_original
-        allow(Puppet::Util).to receive(:get_env).with('PUPPET_DIR').and_return('puppet_dir')
+        allow(ENV).to receive(:[]).and_call_original
+        allow(ENV).to receive(:[]).with('PUPPET_DIR').and_return('puppet_dir')
       end
 
       it 'uses Gem.default_bindir' do
@@ -118,9 +118,9 @@ describe Puppet::Type.type(:package).provider(:puppet_gem) do
     end
 
     context 'when is defaultfor' do
-      let(:os) { Puppet.runtime[:facter].value(:operatingsystem) }
+      let(:os) { Puppet.runtime[:facter].value('os.name') }
       subject do
-        described_class.defaultfor(operatingsystem: os)
+        described_class.defaultfor('os.name': os)
         described_class.specificity
       end
       it { is_expected.to be > 100 }

data/spec/unit/provider/package/puppetserver_gem_spec.rb

@@ -127,9 +127,9 @@ describe Puppet::Type.type(:package).provider(:puppetserver_gem) do
     end
 
     context 'when is defaultfor' do
-      let(:os) {  Puppet.runtime[:facter].value(:operatingsystem) }
+      let(:os) {  Puppet.runtime[:facter].value('os.name') }
       subject do
-        described_class.defaultfor(operatingsystem: os)
+        described_class.defaultfor('os.name': os)
         described_class.specificity
       end
       it { is_expected.to be > 100 }

data/spec/unit/provider/package/tdnf_spec.rb

@@ -7,8 +7,8 @@ describe Puppet::Type.type(:package).provider(:tdnf) do
 
   context 'default' do
     it 'should be the default provider on PhotonOS' do
-      allow(Facter).to receive(:value).with(:osfamily).and_return(:redhat)
-      allow(Facter).to receive(:value).with(:operatingsystem).and_return("PhotonOS")
+      allow(Facter).to receive(:value).with('os.family').and_return(:redhat)
+      allow(Facter).to receive(:value).with('os.name').and_return("PhotonOS")
       expect(described_class).to be_default
     end
   end

data/spec/unit/provider/package/up2date_spec.rb

@@ -13,8 +13,8 @@ describe 'up2date package provider' do
   osfamilies.each do |osfamily|
     releases.each do |release|
       it "should be the default provider on #{osfamily} #{release}" do
-        allow(Facter).to receive(:value).with(:osfamily).and_return(osfamily)
-        allow(Facter).to receive(:value).with(:lsbdistrelease).and_return(release)
+        allow(Facter).to receive(:value).with('os.family').and_return(osfamily)
+        allow(Facter).to receive(:value).with('os.distro.release.full').and_return(release)
         expect(subject.default?).to be_truthy
       end
     end

data/spec/unit/provider/package/yum_spec.rb

@@ -17,42 +17,42 @@ describe Puppet::Type.type(:package).provider(:yum) do
   it_behaves_like 'RHEL package provider', described_class, 'yum'
 
   it "should have lower specificity" do
-    allow(Facter).to receive(:value).with(:osfamily).and_return(:redhat)
-    allow(Facter).to receive(:value).with(:operatingsystem).and_return(:fedora)
-    allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("22")
+    allow(Facter).to receive(:value).with('os.family').and_return(:redhat)
+    allow(Facter).to receive(:value).with('os.name').and_return(:fedora)
+    allow(Facter).to receive(:value).with('os.release.major').and_return("22")
     expect(described_class.specificity).to be < 200
   end
 
   describe "should have logical defaults" do
     [2, 2018].each do |ver|
       it "should be the default provider on Amazon Linux #{ver}" do
-        allow(Facter).to receive(:value).with(:operatingsystem).and_return('amazon')
-        allow(Facter).to receive(:value).with(:osfamily).and_return('redhat')
-        allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return(ver)
+        allow(Facter).to receive(:value).with('os.name').and_return('amazon')
+        allow(Facter).to receive(:value).with('os.family').and_return('redhat')
+        allow(Facter).to receive(:value).with('os.release.major').and_return(ver)
         expect(described_class).to be_default
       end
     end
 
     Array(4..7).each do |ver|
       it "should be default for redhat #{ver}" do
-        allow(Facter).to receive(:value).with(:operatingsystem).and_return('redhat')
-        allow(Facter).to receive(:value).with(:osfamily).and_return('redhat')
-        allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return(ver.to_s)
+        allow(Facter).to receive(:value).with('os.name').and_return('redhat')
+        allow(Facter).to receive(:value).with('os.family').and_return('redhat')
+        allow(Facter).to receive(:value).with('os.release.major').and_return(ver.to_s)
         expect(described_class).to be_default
       end
     end
 
     it "should not be default for redhat 8" do
-      allow(Facter).to receive(:value).with(:operatingsystem).and_return('redhat')
-      allow(Facter).to receive(:value).with(:osfamily).and_return('redhat')
-      allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return('8')
+      allow(Facter).to receive(:value).with('os.name').and_return('redhat')
+      allow(Facter).to receive(:value).with('os.family').and_return('redhat')
+      allow(Facter).to receive(:value).with('os.release.major').and_return('8')
       expect(described_class).not_to be_default
     end
 
     it "should not be default for Ubuntu 16.04" do
-      allow(Facter).to receive(:value).with(:operatingsystem).and_return('ubuntu')
-      allow(Facter).to receive(:value).with(:osfamily).and_return('ubuntu')
-      allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return('16.04')
+      allow(Facter).to receive(:value).with('os.name').and_return('ubuntu')
+      allow(Facter).to receive(:value).with('os.family').and_return('ubuntu')
+      allow(Facter).to receive(:value).with('os.release.major').and_return('16.04')
       expect(described_class).not_to be_default
     end
   end
@@ -346,7 +346,7 @@ describe Puppet::Type.type(:package).provider(:yum) do
   describe 'install' do
     before do
       resource[:ensure] = ensure_value
-      allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return('7')
+      allow(Facter).to receive(:value).with('os.release.major').and_return('7')
       allow(described_class).to receive(:command).with(:cmd).and_return('/usr/bin/yum')
       allow(provider).to receive(:query).twice.and_return(nil, ensure: '18.3.2')
       allow(provider).to receive(:insync?).with('18.3.2').and_return(true)

data/spec/unit/provider/service/base_spec.rb

@@ -98,7 +98,7 @@ describe "base service provider" do
 
     it "retrieves a PID from the process table" do
       allow(Facter).to receive(:value).and_call_original
-      allow(Facter).to receive(:value).with(:operatingsystem).and_return("CentOS")
+      allow(Facter).to receive(:value).with('os.name').and_return("CentOS")
       ps_output = File.binread(my_fixture("ps_ef.mixed_encoding")).force_encoding(Encoding::UTF_8)
 
       expect(executor).to receive(:execute).with("ps -ef").and_return(ps_output)

data/spec/unit/provider/service/bsd_spec.rb

@@ -6,8 +6,8 @@ describe 'Puppet::Type::Service::Provider::Bsd',
 
   before :each do
     allow(Puppet::Type.type(:service)).to receive(:defaultprovider).and_return(provider_class)
-    allow(Facter).to receive(:value).with(:operatingsystem).and_return(:netbsd)
-    allow(Facter).to receive(:value).with(:osfamily).and_return('NetBSD')
+    allow(Facter).to receive(:value).with('os.name').and_return(:netbsd)
+    allow(Facter).to receive(:value).with('os.family').and_return('NetBSD')
     allow(provider_class).to receive(:defpath).and_return('/etc/rc.conf.d')
     @provider = provider_class.new
     allow(@provider).to receive(:initscript)

data/spec/unit/provider/service/debian_spec.rb

@@ -30,20 +30,20 @@ describe 'Puppet::Type::Service::Provider::Debian',
 
   ['1','2'].each do |version|
     it "should be the default provider on CumulusLinux #{version}" do
-      expect(Facter).to receive(:value).with(:operatingsystem).at_least(:once).and_return('CumulusLinux')
-      expect(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return(version)
+      expect(Facter).to receive(:value).with('os.name').at_least(:once).and_return('CumulusLinux')
+      expect(Facter).to receive(:value).with('os.release.major').and_return(version)
       expect(provider_class.default?).to be_truthy
     end
   end
 
   it "should be the default provider on Devuan" do
-    expect(Facter).to receive(:value).with(:operatingsystem).at_least(:once).and_return('Devuan')
+    expect(Facter).to receive(:value).with('os.name').at_least(:once).and_return('Devuan')
     expect(provider_class.default?).to be_truthy
   end
 
   it "should be the default provider on Debian" do
-    expect(Facter).to receive(:value).with(:operatingsystem).at_least(:once).and_return('Debian')
-    expect(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return('7')
+    expect(Facter).to receive(:value).with('os.name').at_least(:once).and_return('Debian')
+    expect(Facter).to receive(:value).with('os.release.major').and_return('7')
     expect(provider_class.default?).to be_truthy
   end
 
@@ -149,8 +149,8 @@ describe 'Puppet::Type::Service::Provider::Debian',
 
   context "when checking service status" do
     it "should use the service command" do
-      allow(Facter).to receive(:value).with(:operatingsystem).and_return('Debian')
-      allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return('8')
+      allow(Facter).to receive(:value).with('os.name').and_return('Debian')
+      allow(Facter).to receive(:value).with('os.release.major').and_return('8')
       allow(@resource).to receive(:[]).with(:hasstatus).and_return(:true)
       expect(@provider.statuscmd).to eq(["service", @resource[:name], "status"])
     end

data/spec/unit/provider/service/freebsd_spec.rb

@@ -7,7 +7,7 @@ describe 'Puppet::Type::Service::Provider::Freebsd',
   before :each do
     @provider = provider_class.new
     allow(@provider).to receive(:initscript)
-    allow(Facter).to receive(:value).with(:osfamily).and_return('FreeBSD')
+    allow(Facter).to receive(:value).with('os.family').and_return('FreeBSD')
   end
 
   it "should correctly parse rcvar for FreeBSD < 7" do

data/spec/unit/provider/service/gentoo_spec.rb

@@ -8,8 +8,8 @@ describe 'Puppet::Type::Service::Provider::Gentoo',
     allow(Puppet::Type.type(:service)).to receive(:defaultprovider).and_return(provider_class)
     allow(Puppet::FileSystem).to receive(:file?).with('/sbin/rc-update').and_return(true)
     allow(Puppet::FileSystem).to receive(:executable?).with('/sbin/rc-update').and_return(true)
-    allow(Facter).to receive(:value).with(:operatingsystem).and_return('Gentoo')
-    allow(Facter).to receive(:value).with(:osfamily).and_return('Gentoo')
+    allow(Facter).to receive(:value).with('os.name').and_return('Gentoo')
+    allow(Facter).to receive(:value).with('os.family').and_return('Gentoo')
 
     # The initprovider (parent of the gentoo provider) does a stat call
     # before it even tries to execute an initscript. We use sshd in all the

data/spec/unit/provider/service/init_spec.rb

@@ -39,8 +39,8 @@ describe 'Puppet::Type::Service::Provider::Init',
 
   describe "when running on FreeBSD" do
     before :each do
-      allow(Facter).to receive(:value).with(:operatingsystem).and_return('FreeBSD')
-      allow(Facter).to receive(:value).with(:osfamily).and_return('FreeBSD')
+      allow(Facter).to receive(:value).with('os.name').and_return('FreeBSD')
+      allow(Facter).to receive(:value).with('os.family').and_return('FreeBSD')
     end
 
     it "should set its default path to include /etc/rc.d and /usr/local/etc/rc.d" do
@@ -50,7 +50,7 @@ describe 'Puppet::Type::Service::Provider::Init',
 
   describe "when running on HP-UX" do
     before :each do
-      allow(Facter).to receive(:value).with(:operatingsystem).and_return('HP-UX')
+      allow(Facter).to receive(:value).with('os.name').and_return('HP-UX')
     end
 
     it "should set its default path to include /sbin/init.d" do
@@ -60,7 +60,7 @@ describe 'Puppet::Type::Service::Provider::Init',
 
   describe "when running on Archlinux" do
     before :each do
-      allow(Facter).to receive(:value).with(:operatingsystem).and_return('Archlinux')
+      allow(Facter).to receive(:value).with('os.name').and_return('Archlinux')
     end
 
     it "should set its default path to include /etc/rc.d" do
@@ -70,7 +70,7 @@ describe 'Puppet::Type::Service::Provider::Init',
 
   describe "when not running on FreeBSD, HP-UX or Archlinux" do
     before :each do
-      allow(Facter).to receive(:value).with(:operatingsystem).and_return('RedHat')
+      allow(Facter).to receive(:value).with('os.name').and_return('RedHat')
     end
 
     it "should set its default path to include /etc/init.d" do
@@ -110,7 +110,7 @@ describe 'Puppet::Type::Service::Provider::Init',
     end
 
     it "should omit Yocto services on cisco-wrlinux" do
-      allow(Facter).to receive(:value).with(:osfamily).and_return('cisco-wrlinux')
+      allow(Facter).to receive(:value).with('os.family').and_return('cisco-wrlinux')
       exclude = 'umountfs'
       expect(provider_class.get_services(provider_class.defpath).map(&:name)).to eq(@services - [exclude])
     end
@@ -295,7 +295,7 @@ describe 'Puppet::Type::Service::Provider::Init',
 
     describe "when starting a service on Solaris" do
       it "should use ctrun" do
-        allow(Facter).to receive(:value).with(:osfamily).and_return('Solaris')
+        allow(Facter).to receive(:value).with('os.family').and_return('Solaris')
         expect(provider).to receive(:execute)
           .with('/usr/bin/ctrun -l child /service/path/myservice start', {:failonfail => true, :override_locale => false, :squelch => false, :combine => true})
           .and_return(process_output)
@@ -305,7 +305,7 @@ describe 'Puppet::Type::Service::Provider::Init',
 
     describe "when starting a service on RedHat" do
       it "should not use ctrun" do
-        allow(Facter).to receive(:value).with(:osfamily).and_return('RedHat')
+        allow(Facter).to receive(:value).with('os.family').and_return('RedHat')
         expect(provider).to receive(:execute)
           .with(['/service/path/myservice', :start], {:failonfail => true, :override_locale => false, :squelch => false, :combine => true})
           .and_return(process_output)

data/spec/unit/provider/service/openbsd_spec.rb

@@ -6,8 +6,8 @@ describe 'Puppet::Type::Service::Provider::Openbsd',
 
   before :each do
     allow(Puppet::Type.type(:service)).to receive(:defaultprovider).and_return(provider_class)
-    allow(Facter).to receive(:value).with(:operatingsystem).and_return(:openbsd)
-    allow(Facter).to receive(:value).with(:osfamily).and_return('OpenBSD')
+    allow(Facter).to receive(:value).with('os.name').and_return(:openbsd)
+    allow(Facter).to receive(:value).with('os.family').and_return('OpenBSD')
     allow(FileTest).to receive(:file?).with('/usr/sbin/rcctl').and_return(true)
     allow(FileTest).to receive(:executable?).with('/usr/sbin/rcctl').and_return(true)
   end

data/spec/unit/provider/service/openwrt_spec.rb

@@ -33,7 +33,7 @@ describe 'Puppet::Type::Service::Provider::Openwrt',
   end
 
   it "should be the default provider on 'openwrt'" do
-    expect(Facter).to receive(:value).with(:operatingsystem).and_return('openwrt')
+    expect(Facter).to receive(:value).with('os.name').and_return('openwrt')
     expect(provider_class.default?).to be_truthy
   end
 

data/spec/unit/provider/service/rcng_spec.rb

@@ -6,8 +6,8 @@ describe 'Puppet::Type::Service::Provider::Rcng',
 
   before :each do
     allow(Puppet::Type.type(:service)).to receive(:defaultprovider).and_return(provider_class)
-    allow(Facter).to receive(:value).with(:operatingsystem).and_return(:netbsd)
-    allow(Facter).to receive(:value).with(:osfamily).and_return('NetBSD')
+    allow(Facter).to receive(:value).with('os.name').and_return(:netbsd)
+    allow(Facter).to receive(:value).with('os.family').and_return('NetBSD')
     allow(provider_class).to receive(:defpath).and_return('/etc/rc.d')
     @provider = provider_class.new
     allow(@provider).to receive(:initscript)