From c7581a1f0e2b64b186a2d7c37e7ba0a9fa2cc1df Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 3 Nov 2016 15:54:46 +0100
Subject: Fix preferences_snippet.pp for puppet 4

---
 manifests/preferences_snippet.pp         | 10 ++---
 spec/defines/preferences_snippet_spec.rb | 66 ++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 5 deletions(-)
 create mode 100644 spec/defines/preferences_snippet_spec.rb

diff --git a/manifests/preferences_snippet.pp b/manifests/preferences_snippet.pp
index b7dba0d..2b2fb74 100644
--- a/manifests/preferences_snippet.pp
+++ b/manifests/preferences_snippet.pp
@@ -2,9 +2,9 @@ define apt::preferences_snippet (
   $priority = undef,
   $package = false,
   $ensure = 'present',
-  $source = '',
-  $release = '',
-  $pin = ''
+  $source = undef,
+  $release = undef,
+  $pin = undef
 ) {
 
   $real_package = $package ? {
@@ -36,9 +36,9 @@ define apt::preferences_snippet (
   }
 
   case $source {
-    '': {
+    undef: {
       case $release {
-        '': {
+        undef: {
           File["/etc/apt/preferences.d/${name}"]{
             content => template('apt/preferences_snippet.erb')
           }
diff --git a/spec/defines/preferences_snippet_spec.rb b/spec/defines/preferences_snippet_spec.rb
new file mode 100644
index 0000000..012a5f6
--- /dev/null
+++ b/spec/defines/preferences_snippet_spec.rb
@@ -0,0 +1,66 @@
+require 'spec_helper'
+describe 'apt::preferences_snippet', :type => :define do
+  let :pre_condition do
+    'class { "apt": }'
+  end
+  let(:facts) { {
+    :lsbdistid => 'Debian',
+    :osfamily => 'Debian',
+    :operatingsystem => 'Debian',
+    :debian_release  => 'jessie',
+    :debian_codename => 'jessie',
+    :lsbdistcodename => 'jessie',
+    :virtual         => 'physical',
+    :puppetversion   => Puppet.version, } }
+  let :title do
+    'test'
+  end
+
+  describe "when creating a preferences_snippet" do
+    let :default_params do
+      {
+        :ensure  => 'present',
+        :release => "jessie-backports",
+        :priority => '999'
+      }
+    end
+    let :params do
+      default_params
+    end
+    let :filename do
+      "/etc/apt/preferences.d/test"
+    end
+
+    it { is_expected.to contain_file(filename).with({
+          'ensure'    => 'present',
+          'content'   => /Package: test\nPin: release a=jessie-backports\nPin-Priority: 999/,
+          'owner'     => 'root',
+          'group'     => '0',
+          'mode'      => '0644',
+        })
+      }
+
+  end
+
+  describe "when using both pin and release parameters" do
+    let :default_params do
+      {
+        :ensure  => 'present',
+        :priority => '999',
+        :release => "jessie-backports",
+        :pin     => '1.0'
+      }
+    end
+    let :params do
+      default_params
+    end
+    let :filename do
+      "/etc/apt/preferences.d/test"
+    end
+
+    it 'fails' do
+      expect { subject.call } .to raise_error(Puppet::Error, /apt::preferences_snippet requires either a 'pin' or 'release' argument, not both/)
+    end
+  end
+
+end
-- 
cgit v1.2.3