puppet 6.0.0 → 6.1.0

data/spec/unit/provider/group/windows_adsi_spec.rb

@@ -49,25 +49,25 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet::Util:
     describe "#members_insync?" do
       it "should return true for same lists of members" do
         current = [
-          Puppet::Util::Windows::SID.name_to_principal('user1'),
-          Puppet::Util::Windows::SID.name_to_principal('user2'),
+          'user1',
+          'user2',
         ]
         expect(provider.members_insync?(current, ['user1', 'user2'])).to be_truthy
       end
 
       it "should return true for same lists of unordered members" do
         current = [
-          Puppet::Util::Windows::SID.name_to_principal('user1'),
-          Puppet::Util::Windows::SID.name_to_principal('user2'),
+          'user1',
+          'user2',
         ]
         expect(provider.members_insync?(current, ['user2', 'user1'])).to be_truthy
       end
 
       it "should return true for same lists of members irrespective of duplicates" do
         current = [
-          Puppet::Util::Windows::SID.name_to_principal('user1'),
-          Puppet::Util::Windows::SID.name_to_principal('user2'),
-          Puppet::Util::Windows::SID.name_to_principal('user2'),
+          'user1',
+          'user2',
+          'user2',
         ]
         expect(provider.members_insync?(current, ['user2', 'user1', 'user1'])).to be_truthy
       end
@@ -91,9 +91,9 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet::Util:
 
         it "should return true when current and should contain the same users in a different order" do
           current = [
-            Puppet::Util::Windows::SID.name_to_principal('user1'),
-            Puppet::Util::Windows::SID.name_to_principal('user2'),
-            Puppet::Util::Windows::SID.name_to_principal('user3'),
+            'user1',
+            'user2',
+            'user3',
           ]
           expect(provider.members_insync?(current, ['user3', 'user1', 'user2'])).to be_truthy
         end
@@ -104,21 +104,21 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet::Util:
 
         it "should return false when should is nil" do
           current = [
-            Puppet::Util::Windows::SID.name_to_principal('user1'),
+            'user1',
           ]
           expect(provider.members_insync?(current, nil)).to be_falsey
         end
 
         it "should return false when current contains different users than should" do
           current = [
-            Puppet::Util::Windows::SID.name_to_principal('user1'),
+            'user1',
           ]
           expect(provider.members_insync?(current, ['user2'])).to be_falsey
         end
 
         it "should return false when current contains members and should is empty" do
           current = [
-            Puppet::Util::Windows::SID.name_to_principal('user1'),
+            'user1',
           ]
           expect(provider.members_insync?(current, [])).to be_falsey
         end
@@ -129,16 +129,16 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet::Util:
 
         it "should return false when should user(s) are not the only items in the current" do
           current = [
-            Puppet::Util::Windows::SID.name_to_principal('user1'),
-            Puppet::Util::Windows::SID.name_to_principal('user2'),
+            'user1',
+            'user2',
           ]
           expect(provider.members_insync?(current, ['user1'])).to be_falsey
         end
 
         it "should return false when current user(s) is not empty and should is an empty list" do
           current = [
-            Puppet::Util::Windows::SID.name_to_principal('user1'),
-            Puppet::Util::Windows::SID.name_to_principal('user2'),
+            'user1',
+            'user2',
           ]
           expect(provider.members_insync?(current, [])).to be_falsey
         end
@@ -156,21 +156,21 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet::Util:
 
         it "should return true when should is nil" do
           current = [
-            Puppet::Util::Windows::SID.name_to_principal('user1'),
+            'user1',
           ]
           expect(provider.members_insync?(current, nil)).to be_truthy
         end
 
         it "should return false when current contains different users than should" do
           current = [
-            Puppet::Util::Windows::SID.name_to_principal('user1'),
+            'user1',
           ]
           expect(provider.members_insync?(current, ['user2'])).to be_falsey
         end
 
         it "should return true when current contains members and should is empty" do
           current = [
-            Puppet::Util::Windows::SID.name_to_principal('user1'),
+            'user1',
           ]
           expect(provider.members_insync?(current, [])).to be_truthy
         end
@@ -181,25 +181,25 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet::Util:
 
         it "should return true when current user(s) contains at least the should list" do
           current = [
-            Puppet::Util::Windows::SID.name_to_principal('user1'),
-            Puppet::Util::Windows::SID.name_to_principal('user2'),
+            'user1',
+            'user2',
           ]
           expect(provider.members_insync?(current, ['user1'])).to be_truthy
         end
 
         it "should return true when current user(s) is not empty and should is an empty list" do
           current = [
-            Puppet::Util::Windows::SID.name_to_principal('user1'),
-            Puppet::Util::Windows::SID.name_to_principal('user2'),
+            'user1',
+            'user2',
           ]
           expect(provider.members_insync?(current, [])).to be_truthy
         end
 
         it "should return true when current user(s) contains at least the should list, even unordered" do
           current = [
-            Puppet::Util::Windows::SID.name_to_principal('user3'),
-            Puppet::Util::Windows::SID.name_to_principal('user1'),
-            Puppet::Util::Windows::SID.name_to_principal('user2'),
+            'user3',
+            'user1',
+            'user2',
           ]
           expect(provider.members_insync?(current, ['user2','user1'])).to be_truthy
         end
@@ -232,14 +232,26 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet::Util:
   end
 
   describe "when managing members" do
+    let(:user1) { stub(:account => 'user1', :domain => '.', :sid => 'user1sid') }
+    let(:user2) { stub(:account => 'user2', :domain => '.', :sid => 'user2sid') }
+    let(:user3) { stub(:account => 'user3', :domain => '.', :sid => 'user3sid') }
+
     before :each do
+      Puppet::Util::Windows::SID.stubs(:name_to_principal).with('user1').returns(user1)
+      Puppet::Util::Windows::SID.stubs(:name_to_principal).with('user2').returns(user2)
+      Puppet::Util::Windows::SID.stubs(:name_to_principal).with('user3').returns(user3)
+
       resource[:auth_membership] = true
     end
 
     it "should be able to provide a list of members" do
-      provider.group.stubs(:members).returns ['user1', 'user2', 'user3']
+      provider.group.stubs(:members).returns [
+        'user1',
+        'user2',
+        'user3',
+      ]
 
-      expect(provider.members).to match_array(['user1', 'user2', 'user3'])
+      expect(provider.members).to match_array([user1.sid, user2.sid, user3.sid])
     end
 
     it "should be able to set group members" do
@@ -290,10 +302,7 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet::Util:
       connection.expects(:Create)
       connection.expects(:SetInfo).raises( WIN32OLERuntimeError.new("(in OLE method `SetInfo': )\n    OLE error code:8007089A in Active Directory\n      The specified username is invalid.\r\n\n    HRESULT error code:0x80020009\n      Exception occurred."))
 
-      expect{ provider.create }.to raise_error(
-                                       Puppet::Error,
-                                       /not able to create\/delete domain groups/
-                                   )
+      expect{ provider.create }.to raise_error(Puppet::Error)
     end
 
     it 'should commit a newly created group' do

data/spec/unit/provider/nameservice/directoryservice_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 module Puppet::Util::Plist
@@ -6,13 +5,11 @@ end
 
 # We use this as a reasonable way to obtain all the support infrastructure.
 [:group].each do |type_for_this_round|
-  provider_class = Puppet::Type.type(type_for_this_round).provider(:directoryservice)
-
-  describe provider_class do
+  describe Puppet::Type.type(type_for_this_round).provider(:directoryservice) do
     before do
       @resource = stub("resource")
       @resource.stubs(:[]).with(:name)
-      @provider = provider_class.new(@resource)
+      @provider = described_class.new(@resource)
     end
 
     it "[#6009] should handle nested arrays of members" do
@@ -40,125 +37,122 @@ end
   end
 end
 
-describe 'DirectoryService.single_report' do
-  it 'should use plist data' do
-    Puppet::Provider::NameService::DirectoryService.stubs(:get_ds_path).returns('Users')
-    Puppet::Provider::NameService::DirectoryService.stubs(:list_all_present).returns(
-      ['root', 'user1', 'user2', 'resource_name']
-    )
-    Puppet::Provider::NameService::DirectoryService.stubs(:generate_attribute_hash)
-    Puppet::Provider::NameService::DirectoryService.stubs(:execute)
-    Puppet::Provider::NameService::DirectoryService.expects(:parse_dscl_plist_data)
-
-    Puppet::Provider::NameService::DirectoryService.single_report('resource_name')
+describe Puppet::Provider::NameService::DirectoryService do
+  context '.single_report' do
+    it 'should use plist data' do
+      Puppet::Provider::NameService::DirectoryService.stubs(:get_ds_path).returns('Users')
+      Puppet::Provider::NameService::DirectoryService.stubs(:list_all_present).returns(
+        ['root', 'user1', 'user2', 'resource_name']
+      )
+      Puppet::Provider::NameService::DirectoryService.stubs(:generate_attribute_hash)
+      Puppet::Provider::NameService::DirectoryService.stubs(:execute)
+      Puppet::Provider::NameService::DirectoryService.expects(:parse_dscl_plist_data)
+
+      Puppet::Provider::NameService::DirectoryService.single_report('resource_name')
+    end
   end
-end
 
-describe 'DirectoryService.get_exec_preamble' do
-  it 'should use plist data' do
-    Puppet::Provider::NameService::DirectoryService.stubs(:get_ds_path).returns('Users')
+  context '.get_exec_preamble' do
+    it 'should use plist data' do
+      Puppet::Provider::NameService::DirectoryService.stubs(:get_ds_path).returns('Users')
 
-    expect(Puppet::Provider::NameService::DirectoryService.get_exec_preamble('-list')).to include("-plist")
+      expect(Puppet::Provider::NameService::DirectoryService.get_exec_preamble('-list')).to include("-plist")
+    end
   end
-end
-
-describe 'DirectoryService password behavior' do
-  # The below is a binary plist containing a ShadowHashData key which CONTAINS
-  # another binary plist. The nested binary plist contains a 'SALTED-SHA512'
-  # key that contains a base64 encoded salted-SHA512 password hash...
-  let (:binary_plist) { "bplist00\324\001\002\003\004\005\006\a\bXCRAM-MD5RNT]SALTED-SHA512[RECOVERABLEO\020 \231k2\3360\200GI\201\355J\216\202\215y\243\001\206J\300\363\032\031\022\006\2359\024\257\217<\361O\020\020F\353\at\377\277\226\276c\306\254\031\037J(\235O\020D\335\006{\3744g@\377z\204\322\r\332t\021\330\n\003\246K\223\356\034!P\261\305t\035\346\352p\206\003n\247MMA\310\301Z<\366\246\023\0161W3\340\357\000\317T\t\301\311+\204\246L7\276\370\320*\245O\021\002\000k\024\221\270x\353\001\237\346D}\377?\265]\356+\243\v[\350\316a\340h\376<\322\266\327\016\306n\272r\t\212A\253L\216\214\205\016\241 [\360/\335\002#\\A\372\241a\261\346\346\\\251\330\312\365\016\n\341\017\016\225&;\322\\\004*\ru\316\372\a \362?8\031\247\231\030\030\267\315\023\v\343{@\227\301s\372h\212\000a\244&\231\366\nt\277\2036,\027bZ+\223W\212g\333`\264\331N\306\307\362\257(^~ b\262\247&\231\261t\341\231%\244\247\203eOt\365\271\201\273\330\350\363C^A\327F\214!\217hgf\e\320k\260n\315u~\336\371M\t\235k\230S\375\311\303\240\351\037d\273\321y\335=K\016`_\317\230\2612_\023K\036\350\v\232\323Y\310\317_\035\227%\237\v\340\023\016\243\233\025\306:\227\351\370\364x\234\231\266\367\016w\275\333-\351\210}\375x\034\262\272kRuHa\362T/F!\347B\231O`K\304\037'k$$\245h)e\363\365mT\b\317\\2\361\026\351\254\375Jl1~\r\371\267\352\2322I\341\272\376\243^Un\266E7\230[VocUJ\220N\2116D/\025f=\213\314\325\vG}\311\360\377DT\307m\261&\263\340\272\243_\020\271rG^BW\210\030l\344\0324\335\233\300\023\272\225Im\330\n\227*Yv[\006\315\330y'\a\321\373\273A\240\305F{S\246I#/\355\2425\031\031GGF\270y\n\331\004\023G@\331\000\361\343\350\264$\032\355_\210y\000\205\342\375\212q\024\004\026W:\205 \363v?\035\270L-\270=\022\323\2003\v\336\277\t\237\356\374\n\267n\003\367\342\330;\371S\326\016`B6@Njm>\240\021%\336\345\002(P\204Yn\3279l\0228\264\254\304\2528t\372h\217\347sA\314\345\245\337)]\000\b\000\021\000\032\000\035\000+\0007\000Z\000m\000\264\000\000\000\000\000\000\002\001\000\000\000\000\000\000\000\t\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\270" }
 
-  # The below is a base64 encoded salted-SHA512 password hash.
-  let (:pw_string) { "\335\006{\3744g@\377z\204\322\r\332t\021\330\n\003\246K\223\356\034!P\261\305t\035\346\352p\206\003n\247MMA\310\301Z<\366\246\023\0161W3\340\357\000\317T\t\301\311+\204\246L7\276\370\320*\245" }
+  context 'password behavior' do
+    # The below is a binary plist containing a ShadowHashData key which CONTAINS
+    # another binary plist. The nested binary plist contains a 'SALTED-SHA512'
+    # key that contains a base64 encoded salted-SHA512 password hash...
+    let (:binary_plist) { "bplist00\324\001\002\003\004\005\006\a\bXCRAM-MD5RNT]SALTED-SHA512[RECOVERABLEO\020 \231k2\3360\200GI\201\355J\216\202\215y\243\001\206J\300\363\032\031\022\006\2359\024\257\217<\361O\020\020F\353\at\377\277\226\276c\306\254\031\037J(\235O\020D\335\006{\3744g@\377z\204\322\r\332t\021\330\n\003\246K\223\356\034!P\261\305t\035\346\352p\206\003n\247MMA\310\301Z<\366\246\023\0161W3\340\357\000\317T\t\301\311+\204\246L7\276\370\320*\245O\021\002\000k\024\221\270x\353\001\237\346D}\377?\265]\356+\243\v[\350\316a\340h\376<\322\266\327\016\306n\272r\t\212A\253L\216\214\205\016\241 [\360/\335\002#\\A\372\241a\261\346\346\\\251\330\312\365\016\n\341\017\016\225&;\322\\\004*\ru\316\372\a \362?8\031\247\231\030\030\267\315\023\v\343{@\227\301s\372h\212\000a\244&\231\366\nt\277\2036,\027bZ+\223W\212g\333`\264\331N\306\307\362\257(^~ b\262\247&\231\261t\341\231%\244\247\203eOt\365\271\201\273\330\350\363C^A\327F\214!\217hgf\e\320k\260n\315u~\336\371M\t\235k\230S\375\311\303\240\351\037d\273\321y\335=K\016`_\317\230\2612_\023K\036\350\v\232\323Y\310\317_\035\227%\237\v\340\023\016\243\233\025\306:\227\351\370\364x\234\231\266\367\016w\275\333-\351\210}\375x\034\262\272kRuHa\362T/F!\347B\231O`K\304\037'k$$\245h)e\363\365mT\b\317\\2\361\026\351\254\375Jl1~\r\371\267\352\2322I\341\272\376\243^Un\266E7\230[VocUJ\220N\2116D/\025f=\213\314\325\vG}\311\360\377DT\307m\261&\263\340\272\243_\020\271rG^BW\210\030l\344\0324\335\233\300\023\272\225Im\330\n\227*Yv[\006\315\330y'\a\321\373\273A\240\305F{S\246I#/\355\2425\031\031GGF\270y\n\331\004\023G@\331\000\361\343\350\264$\032\355_\210y\000\205\342\375\212q\024\004\026W:\205 \363v?\035\270L-\270=\022\323\2003\v\336\277\t\237\356\374\n\267n\003\367\342\330;\371S\326\016`B6@Njm>\240\021%\336\345\002(P\204Yn\3279l\0228\264\254\304\2528t\372h\217\347sA\314\345\245\337)]\000\b\000\021\000\032\000\035\000+\0007\000Z\000m\000\264\000\000\000\000\000\000\002\001\000\000\000\000\000\000\000\t\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\270" }
 
-  # The below is a salted-SHA512 password hash in hex.
-  let (:sha512_hash) { 'dd067bfc346740ff7a84d20dda7411d80a03a64b93ee1c2150b1c5741de6ea7086036ea74d4d41c8c15a3cf6a6130e315733e0ef00cf5409c1c92b84a64c37bef8d02aa5' }
+    # The below is a base64 encoded salted-SHA512 password hash.
+    let (:pw_string) { "\335\006{\3744g@\377z\204\322\r\332t\021\330\n\003\246K\223\356\034!P\261\305t\035\346\352p\206\003n\247MMA\310\301Z<\366\246\023\0161W3\340\357\000\317T\t\301\311+\204\246L7\276\370\320*\245" }
 
-  let :plist_path do
-    '/var/db/dslocal/nodes/Default/users/jeff.plist'
-  end
+    # The below is a salted-SHA512 password hash in hex.
+    let (:sha512_hash) { 'dd067bfc346740ff7a84d20dda7411d80a03a64b93ee1c2150b1c5741de6ea7086036ea74d4d41c8c15a3cf6a6130e315733e0ef00cf5409c1c92b84a64c37bef8d02aa5' }
 
-  let :ds_provider do
-    Puppet::Provider::NameService::DirectoryService
-  end
+    let :plist_path do
+      '/var/db/dslocal/nodes/Default/users/jeff.plist'
+    end
 
-  let :shadow_hash_data do
-    {'ShadowHashData' => [binary_plist]}
-  end
+    let :ds_provider do
+      described_class
+    end
 
-  subject do
-    Puppet::Provider::NameService::DirectoryService
-  end
+    let :shadow_hash_data do
+      {'ShadowHashData' => [binary_plist]}
+    end
 
-  it 'should execute convert_binary_to_hash once when getting the password' do
-    subject.expects(:convert_binary_to_hash).returns({'SALTED-SHA512' => pw_string})
-    Puppet::FileSystem.expects(:exist?).with(plist_path).once.returns(true)
-    Puppet::Util::Plist.expects(:read_plist_file).returns(shadow_hash_data)
-    subject.get_password('uid', 'jeff')
-  end
+    it 'should execute convert_binary_to_hash once when getting the password' do
+      described_class.expects(:convert_binary_to_hash).returns({'SALTED-SHA512' => pw_string})
+      Puppet::FileSystem.expects(:exist?).with(plist_path).once.returns(true)
+      Puppet::Util::Plist.expects(:read_plist_file).returns(shadow_hash_data)
+      described_class.get_password('uid', 'jeff')
+    end
 
-  it 'should fail if a salted-SHA512 password hash is not passed in' do
-    expect {
-      subject.set_password('jeff', 'uid', 'badpassword')
-    }.to raise_error(RuntimeError, /OS X 10.7 requires a Salted SHA512 hash password of 136 characters./)
-  end
+    it 'should fail if a salted-SHA512 password hash is not passed in' do
+      expect {
+        described_class.set_password('jeff', 'uid', 'badpassword')
+      }.to raise_error(RuntimeError, /OS X 10.7 requires a Salted SHA512 hash password of 136 characters./)
+    end
 
-  it 'should convert xml-to-binary and binary-to-xml when setting the pw on >= 10.7' do
-    subject.expects(:convert_binary_to_hash).returns({'SALTED-SHA512' => pw_string})
-    subject.expects(:convert_hash_to_binary).returns(binary_plist)
-    Puppet::FileSystem.expects(:exist?).with(plist_path).once.returns(true)
-    Puppet::Util::Plist.expects(:read_plist_file).returns(shadow_hash_data)
-    Puppet::Util::Plist.expects(:write_plist_file).with(shadow_hash_data, plist_path, :binary)
-    subject.set_password('jeff', 'uid', sha512_hash)
-  end
+    it 'should convert xml-to-binary and binary-to-xml when setting the pw on >= 10.7' do
+      described_class.expects(:convert_binary_to_hash).returns({'SALTED-SHA512' => pw_string})
+      described_class.expects(:convert_hash_to_binary).returns(binary_plist)
+      Puppet::FileSystem.expects(:exist?).with(plist_path).once.returns(true)
+      Puppet::Util::Plist.expects(:read_plist_file).returns(shadow_hash_data)
+      Puppet::Util::Plist.expects(:write_plist_file).with(shadow_hash_data, plist_path, :binary)
+      described_class.set_password('jeff', 'uid', sha512_hash)
+    end
 
-  it '[#13686] should handle an empty ShadowHashData field in the users plist' do
-    subject.expects(:convert_hash_to_binary).returns(binary_plist)
-    Puppet::FileSystem.expects(:exist?).with(plist_path).once.returns(true)
-    Puppet::Util::Plist.expects(:read_plist_file).returns({'ShadowHashData' => nil})
-    Puppet::Util::Plist.expects(:write_plist_file)
-    subject.set_password('jeff', 'uid', sha512_hash)
+    it '[#13686] should handle an empty ShadowHashData field in the users plist' do
+      described_class.expects(:convert_hash_to_binary).returns(binary_plist)
+      Puppet::FileSystem.expects(:exist?).with(plist_path).once.returns(true)
+      Puppet::Util::Plist.expects(:read_plist_file).returns({'ShadowHashData' => nil})
+      Puppet::Util::Plist.expects(:write_plist_file)
+      described_class.set_password('jeff', 'uid', sha512_hash)
+    end
   end
-end
 
-describe '(#4855) directoryservice group resource failure' do
-  let :provider_class do
-    Puppet::Type.type(:group).provider(:directoryservice)
-  end
+  context '(#4855) directoryservice group resource failure' do
+    let :provider_class do
+      Puppet::Type.type(:group).provider(:directoryservice)
+    end
 
-  let :group_members do
-    ['root','jeff']
-  end
+    let :group_members do
+      ['root','jeff']
+    end
 
-  let :user_account do
-    ['root']
-  end
+    let :user_account do
+      ['root']
+    end
 
-  let :stub_resource do
-    stub('resource')
-  end
+    let :stub_resource do
+      stub('resource')
+    end
 
-  subject do
-    provider_class.new(stub_resource)
-  end
+    subject do
+      provider_class.new(stub_resource)
+    end
 
-  before :each do
-    @resource = stub("resource")
-    @resource.stubs(:[]).with(:name)
-    @provider = provider_class.new(@resource)
-  end
+    before :each do
+      @resource = stub("resource")
+      @resource.stubs(:[]).with(:name)
+      @provider = provider_class.new(@resource)
+    end
 
-  it 'should delete a group member if the user does not exist' do
-    stub_resource.stubs(:[]).with(:name).returns('fake_group')
-    stub_resource.stubs(:name).returns('fake_group')
-    subject.expects(:execute).with([:dseditgroup, '-o', 'edit', '-n', '.',
-                                   '-d', 'jeff',
-                                   'fake_group']).raises(Puppet::ExecutionFailure,
-                                   'it broke')
-    subject.expects(:execute).with([:dscl, '.', '-delete',
-                                   '/Groups/fake_group', 'GroupMembership',
-                                   'jeff'])
-    subject.remove_unwanted_members(group_members, user_account)
+    it 'should delete a group member if the user does not exist' do
+      stub_resource.stubs(:[]).with(:name).returns('fake_group')
+      stub_resource.stubs(:name).returns('fake_group')
+      subject.expects(:execute).with([:dseditgroup, '-o', 'edit', '-n', '.',
+                                    '-d', 'jeff',
+                                    'fake_group']).raises(Puppet::ExecutionFailure,
+                                    'it broke')
+      subject.expects(:execute).with([:dscl, '.', '-delete',
+                                    '/Groups/fake_group', 'GroupMembership',
+                                    'jeff'])
+      subject.remove_unwanted_members(group_members, user_account)
+    end
   end
 end
-

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

@@ -1,9 +1,6 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
-provider_class = Puppet::Type.type(:package).provider(:aix)
-
-describe provider_class do
+describe Puppet::Type.type(:package).provider(:aix) do
   before(:each) do
     # Create a mock resource
     @resource = Puppet::Type.type(:package).new(:name => 'mypackage', :ensure => :installed, :source => 'mysource', :provider => :aix)
@@ -23,7 +20,7 @@ describe provider_class do
     @provider.uninstall
   end
 
-  describe "when installing" do
+  context "when installing" do
     it "should install a package" do
       @provider.expects(:installp).with('-acgwXY', '-d', 'mysource', 'mypackage')
       @provider.install
@@ -86,7 +83,7 @@ mypackage                 1.2.3.3         Already superseded by 1.2.3.4
     end
   end
 
-  describe "when finding the latest version" do
+  context "when finding the latest version" do
     it "should return the current version when no later version is present" do
       @provider.stubs(:latest_info).returns(nil)
       @provider.stubs(:properties).returns( { :ensure => "1.2.3.4" } )
@@ -126,7 +123,7 @@ END
     latest = Puppet::Type.type(:package).new(:name => 'mypackage', :ensure => :latest, :source => 'mysource', :provider => :aix)
     absent = Puppet::Type.type(:package).new(:name => 'otherpackage', :ensure => :absent, :provider => :aix)
     Process.stubs(:euid).returns(0)
-    provider_class.expects(:execute).returns 'mypackage:mypackage.rte:1.8.6.4::I:T:::::N:A Super Cool Package::::0::\n'
-    provider_class.prefetch({ 'mypackage' => latest, 'otherpackage' => absent })
+    described_class.expects(:execute).returns 'mypackage:mypackage.rte:1.8.6.4::I:T:::::N:A Super Cool Package::::0::\n'
+    described_class.prefetch({ 'mypackage' => latest, 'otherpackage' => absent })
   end
 end

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

@@ -1,9 +1,6 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
-provider_class = Puppet::Type.type(:package).provider(:apt)
-
-describe provider_class do
+describe Puppet::Type.type(:package).provider(:apt) do
   let(:name) { 'asdf' }
 
   let(:resource) do
@@ -14,7 +11,7 @@ describe provider_class do
   end
 
   let(:provider) do
-    provider = provider_class.new
+    provider = subject()
     provider.resource = resource
     provider
   end
@@ -25,7 +22,7 @@ describe provider_class do
   end
 
   it "should be versionable" do
-    expect(provider_class).to be_versionable
+    expect(described_class).to be_versionable
   end
 
   it "should use :install to update" do

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

@@ -3,35 +3,48 @@ require 'spec_helper'
 # Note that much of the functionality of the dnf provider is already tested with yum provider tests,
 # as yum is the parent provider.
 
-provider_class = Puppet::Type.type(:package).provider(:dnf)
-
-context 'default' do
-  (19..21).each do |ver|
-    it "should not be the default provider on fedora#{ver}" do
-      Facter.stubs(:value).with(:osfamily).returns(:redhat)
-      Facter.stubs(:value).with(:operatingsystem).returns(:fedora)
-      Facter.stubs(:value).with(:operatingsystemmajrelease).returns("#{ver}")
-      expect(provider_class).to_not be_default
+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
+        Facter.stubs(:value).with(:osfamily).returns(:redhat)
+        Facter.stubs(:value).with(:operatingsystem).returns(:fedora)
+        Facter.stubs(:value).with(:operatingsystemmajrelease).returns("#{ver}")
+        expect(described_class).to_not be_default
+      end
     end
-  end
 
-  (22..26).each do |ver|
-    it "should be the default provider on fedora#{ver}" do
-      Facter.stubs(:value).with(:osfamily).returns(:redhat)
-      Facter.stubs(:value).with(:operatingsystem).returns(:fedora)
-      Facter.stubs(:value).with(:operatingsystemmajrelease).returns("#{ver}")
-      expect(provider_class).to be_default
+    (22..26).each do |ver|
+      it "should be the default provider on fedora#{ver}" do
+        Facter.stubs(:value).with(:osfamily).returns(:redhat)
+        Facter.stubs(:value).with(:operatingsystem).returns(:fedora)
+        Facter.stubs(:value).with(:operatingsystemmajrelease).returns("#{ver}")
+        expect(described_class).to be_default
+      end
+    end
+
+    it "should not be the default provider on rhel7" do
+        Facter.stubs(:value).with(:osfamily).returns(:redhat)
+        Facter.stubs(:value).with(:operatingsystem).returns(:redhat)
+        Facter.stubs(:value).with(:operatingsystemmajrelease).returns("7")
+        expect(described_class).to_not be_default
+    end
+
+    it "should be the default provider on some random future fedora" do
+        Facter.stubs(:value).with(:osfamily).returns(:redhat)
+        Facter.stubs(:value).with(:operatingsystem).returns(:fedora)
+        Facter.stubs(:value).with(:operatingsystemmajrelease).returns("8675")
+        expect(described_class).to be_default
+    end
+
+    it "should be the default provider on rhel8" do
+        Facter.stubs(:value).with(:osfamily).returns(:redhat)
+        Facter.stubs(:value).with(:operatingsystem).returns(:redhat)
+        Facter.stubs(:value).with(:operatingsystemmajrelease).returns("8")
+        expect(described_class).to be_default
     end
-  end
 
-  it "should be the default provider on some random future fedora" do
-    Facter.stubs(:value).with(:osfamily).returns(:redhat)
-    Facter.stubs(:value).with(:operatingsystem).returns(:fedora)
-    Facter.stubs(:value).with(:operatingsystemmajrelease).returns("8675")
-    expect(provider_class).to be_default
   end
-end
 
-describe provider_class do
-  it_behaves_like 'RHEL package provider', provider_class, 'dnf'
+  it_behaves_like 'RHEL package provider', described_class, 'dnf'
 end