Merge pull request #1208 from bastelfreak/setting

apt::setting: Dont expect source/content when removing settings

Author: joshcooper

manifests/setting.pp

@@ -30,8 +30,10 @@
     fail('apt::setting cannot have both content and source')
   }
 
-  if !$content and !$source {
-    fail('apt::setting needs either of content or source')
+  if $ensure != 'absent' {
+    if !$content and !$source {
+      fail('apt::setting needs either of content or source')
+    }
   }
 
   $title_array = split($title, '-')

spec/defines/setting_spec.rb

@@ -143,9 +143,16 @@
     it { is_expected.to contain_file('/etc/apt/apt.conf.d/100teddybear').that_notifies('Class[Apt::Update]') }
   end
 
-  describe 'with ensure=absent' do
+  describe 'with ensure=absent and default params' do
     let(:params) { default_params.merge(ensure: 'absent') }
 
+    it {
+      expect(subject).to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Class[Apt::Update]').with(ensure: 'absent')
+    }
+  end
+  describe 'with ensure=absent and without default params' do
+    let(:params) { { ensure: 'absent' } }
+
     it {
       expect(subject).to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Class[Apt::Update]').with(ensure: 'absent')
     }