Merge pull request #389 from stdietrich/global_header_partial

[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 e5db5c58d48595c19ea6c5919eca829f2ecb07eb..8ca7f8e20308f763910b800e60c6c41db9a32d72 100644 (file)
--- a/spec/defines/source_spec.rb
+++ b/spec/defines/source_spec.rb
@@ -1,7 +1,8 @@
 require 'spec_helper'
 
 describe 'apt::source', :type => :define do
-  GPG_KEY_ID = '4BD6EC30'
+  GPG_KEY_ID = '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30'
+
 
   let :title do
     'my_source'
@@ -28,7 +29,7 @@ describe 'apt::source', :type => :define do
       'owner'  => 'root',
       'group'  => 'root',
       'mode'   => '0644',
-    }).with_content(/#file generated by puppet\n# my_source\ndeb-src  wheezy main\n/)
+    }).with_content(/# my_source\ndeb-src  wheezy main\n/)
     }
   end
 
@@ -54,7 +55,7 @@ describe 'apt::source', :type => :define do
         'key_source'        => 'http://apt.puppetlabs.com/pubkey.gpg',
         'pin'               => '10',
         'architecture'      => 'x86_64',
-        'trusted'           => true,
+        'trusted_source'    => true,
       }
     end
 
@@ -64,7 +65,7 @@ describe 'apt::source', :type => :define do
       'owner'  => 'root',
       'group'  => 'root',
       'mode'   => '0644',
-    }).with_content(/#file generated by puppet\n# foo\ndeb \[arch=x86_64 trusted=yes\] http:\/\/debian\.mirror\.iweb\.ca\/debian\/ sid testing\n/).without_content(/deb-src/)
+    }).with_content(/# foo\ndeb \[arch=x86_64 trusted=yes\] http:\/\/debian\.mirror\.iweb\.ca\/debian\/ sid testing\n/).without_content(/deb-src/)
     }
 
     it { is_expected.to contain_apt__pin('my_source').that_comes_before('File[my_source.list]').with({
@@ -93,7 +94,7 @@ describe 'apt::source', :type => :define do
     }
   end
 
-  context 'trusted true' do
+  context 'trusted_source true' do
     let :facts do
       {
         :lsbdistid       => 'Debian',
@@ -103,8 +104,8 @@ describe 'apt::source', :type => :define do
     end
     let :params do
       {
-        'include_src' => false,
-        'trusted'     => true,
+        'include_src'    => false,
+        'trusted_source' => true,
       }
     end
 
@@ -114,7 +115,7 @@ describe 'apt::source', :type => :define do
       'owner'  => 'root',
       'group'  => 'root',
       'mode'   => '0644',
-    }).with_content(/#file generated by puppet\n# my_source\ndeb \[trusted=yes\]  wheezy main\n/)
+    }).with_content(/# my_source\ndeb \[trusted=yes\]  wheezy main\n/)
     }
   end
 
@@ -139,7 +140,7 @@ describe 'apt::source', :type => :define do
       'owner'  => 'root',
       'group'  => 'root',
       'mode'   => '0644',
-    }).with_content(/#file generated by puppet\n# my_source\ndeb-src \[arch=x86_64 \]  wheezy main\n/)
+    }).with_content(/# my_source\ndeb-src \[arch=x86_64 \]  wheezy main\n/)
     }
   end