apt::source: Rename `trusted_source`.

[puppet-modules/puppetlabs-apt.git] / spec / defines / source_spec.rb

diff --git a/spec/defines/source_spec.rb b/spec/defines/source_spec.rb
index 06363e608cc7d409f1f7802b22bbb20ae9dc737d..d5e146a2f449d231fcbd11981ba6a51cb14e65d7 100644 (file)
--- a/spec/defines/source_spec.rb
+++ b/spec/defines/source_spec.rb
@@ -11,7 +11,7 @@ describe 'apt::source' do
     'my_source'
   end
 
-  context 'mostly defaults' do
+  context 'defaults' do
     let :facts do
       {
         :lsbdistid       => 'Debian',
@@ -20,17 +20,9 @@ describe 'apt::source' do
       }
     end
 
-    let :params do
-      {
-        :include_deb => false,
-        :include_src => true,
-      }
-    end
-
     it { is_expected.to contain_apt__setting('list-my_source').with({
-      :ensure => 'present',
-    }).with_content(/# my_source\ndeb-src  wheezy main\n/)
-
+      :ensure  => 'present',
+    }).without_content(/# my_source\ndeb-src  wheezy main\n/)
     }
   end
 
@@ -49,11 +41,10 @@ describe 'apt::source' do
           :location          => 'http://debian.mirror.iweb.ca/debian/',
           :release           => 'sid',
           :repos             => 'testing',
-          :include_src       => false,
           :key               => GPG_KEY_ID,
           :pin               => '10',
           :architecture      => 'x86_64',
-          :trusted_source    => true,
+          :allow_unsigned    => true,
         }
       end
 
@@ -71,7 +62,7 @@ describe 'apt::source' do
 
       it { is_expected.to contain_apt__key("Add key: #{GPG_KEY_ID} from Apt::Source my_source").that_comes_before('Apt::Setting[list-my_source]').with({
         :ensure  => 'present',
-        :key     => GPG_KEY_ID,
+        :id      => GPG_KEY_ID,
       })
       }
     end
@@ -83,13 +74,12 @@ describe 'apt::source' do
           :location          => 'http://debian.mirror.iweb.ca/debian/',
           :release           => 'sid',
           :repos             => 'testing',
-          :include_src       => false,
           :key               => { 'id' => GPG_KEY_ID, 'server' => 'pgp.mit.edu',
                                   'content' => 'GPG key content',
                                   'source'  => 'http://apt.puppetlabs.com/pubkey.gpg',},
           :pin               => '10',
           :architecture      => 'x86_64',
-          :trusted_source    => true,
+          :allow_unsigned    => true,
         }
       end
 
@@ -107,7 +97,7 @@ describe 'apt::source' do
 
       it { is_expected.to contain_apt__key("Add key: #{GPG_KEY_ID} from Apt::Source my_source").that_comes_before('Apt::Setting[list-my_source]').with({
         :ensure  => 'present',
-        :key     => GPG_KEY_ID,
+        :id      => GPG_KEY_ID,
         :server  => 'pgp.mit.edu',
         :content => 'GPG key content',
         :source  => 'http://apt.puppetlabs.com/pubkey.gpg',
@@ -122,11 +112,10 @@ describe 'apt::source' do
           :location       => 'http://debian.mirror.iweb.ca/debian/',
           :release        => 'sid',
           :repos          => 'testing',
-          :include_src    => false,
           :key            => GPG_KEY_ID,
           :pin            => '10',
           :architecture   => 'x86_64',
-          :trusted_source => true,
+          :allow_unsigned => true,
         }
       end
 
@@ -150,7 +139,7 @@ describe 'apt::source' do
     end
   end
 
-  context 'trusted_source true' do
+  context 'allow_unsigned true' do
     let :facts do
       {
         :lsbdistid       => 'Debian',
@@ -160,8 +149,7 @@ describe 'apt::source' do
     end
     let :params do
       {
-        :include_src    => false,
-        :trusted_source => true,
+        :allow_unsigned => true,
       }
     end
 
@@ -181,8 +169,7 @@ describe 'apt::source' do
     end
     let :params do
       {
-        :include_deb  => false,
-        :include_src  => true,
+        :include      => {'deb' => false, 'src' => true,},
         :architecture => 'x86_64',
       }
     end