Merge pull request #451 from puppetlabs/daenney/consolidate-include

[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..856007bf503fe12fc6d880b8e1d47bb99f524554 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({
@@ -140,16 +140,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' => '55BE302B', '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' => '4BD6EC30', 'server' => 'pgp.mit.edu' },
       }
     } } }
 
@@ -180,19 +178,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