Merge pull request #502 from mhaskel/merge_2.0.x_to_master

[puppet-modules/puppetlabs-apt.git] / spec / classes / apt_spec.rb

diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb
index 8e8a6c6613c5d1b2cf7636040697e59c342c14d3..ee7cd33a24e04610aef6a894d87e2c841dfb4d27 100644 (file)
--- a/spec/classes/apt_spec.rb
+++ b/spec/classes/apt_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 describe 'apt' do
-  let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian' } }
+  let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian', :lsbdistcodename => 'wheezy'} }
 
   context 'defaults' do
     it { is_expected.to contain_file('sources.list').that_notifies('Exec[apt_update]').only_with({
@@ -9,7 +9,6 @@ describe 'apt' do
       :owner   => 'root',
       :group   => 'root',
       :mode    => '0644',
-      :content => "# Repos managed by puppet.\n",
       :notify  => 'Exec[apt_update]',
     })}
 
@@ -19,13 +18,13 @@ describe 'apt' do
       :owner   => 'root',
       :group   => 'root',
       :mode    => '0644',
-      :purge   => true,
-      :recurse => true,
+      :purge   => false,
+      :recurse => false,
       :notify  => 'Exec[apt_update]',
     })}
 
     it { is_expected.to contain_file('preferences').that_notifies('Exec[apt_update]').only_with({
-      :ensure  => 'absent',
+      :ensure  => 'file',
       :path    => '/etc/apt/preferences',
       :owner   => 'root',
       :group   => 'root',
@@ -39,8 +38,8 @@ describe 'apt' do
       :owner   => 'root',
       :group   => 'root',
       :mode    => '0644',
-      :purge   => true,
-      :recurse => true,
+      :purge   => false,
+      :recurse => false,
       :notify  => 'Exec[apt_update]',
     })}
 
@@ -96,7 +95,7 @@ describe 'apt' do
   context 'lots of non-defaults' do
     let :params do
       {
-        :update => { 'always' => true, 'timeout' => 1, 'tries' => 3 },
+        :update => { 'frequency' => 'always', 'timeout' => 1, 'tries' => 3 },
         :purge  => { 'sources.list' => false, 'sources.list.d' => false,
                      'preferences' => false, 'preferences.d' => false, },
       }
@@ -140,16 +139,14 @@ describe 'apt' do
         'location'          => 'http://debian.mirror.iweb.ca/debian/',
         'release'           => 'unstable',
         'repos'             => 'main contrib non-free',
-        'key'               => '55BE302B',
-        'key_server'        => 'subkeys.pgp.net',
+        'key'               => { 'id' => '150C8614919D8446E01E83AF9AA38DCD55BE302B', 'server' => 'subkeys.pgp.net' },
         'pin'               => '-10',
-        'include_src'       => true,
+        'include'           => {'src' => true,},
       },
       'puppetlabs' => {
         'location'   => 'http://apt.puppetlabs.com',
         'repos'      => 'main',
-        'key'        => '4BD6EC30',
-        'key_server' => 'pgp.mit.edu',
+        'key'        => { 'id' => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30', 'server' => 'pgp.mit.edu' },
       }
     } } }
 
@@ -180,19 +177,19 @@ describe 'apt' do
     end
     let(:params) { { :keys => {
       '55BE302B' => {
-        'key_server' => 'subkeys.pgp.net',
+        'server' => 'subkeys.pgp.net',
       },
       '4BD6EC30' => {
-        'key_server' => 'pgp.mit.edu',
+        'server' => 'pgp.mit.edu',
       }
     } } }
 
     it { is_expected.to contain_apt__key('55BE302B').with({
-        :key_server => 'subkeys.pgp.net',
+        :server => 'subkeys.pgp.net',
     })}
 
     it { is_expected.to contain_apt__key('4BD6EC30').with({
-        :key_server => 'pgp.mit.edu',
+        :server => 'pgp.mit.edu',
     })}
   end