X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fdefines%2Fsource_spec.rb;h=3436f559036b3744b7d372b4927ebda6501fc56d;hb=06cc36d7a3a7d8e95cc572683f03dc70254a5b33;hp=38f5b9d2cd1f196d06863fe04ffe9300b46b9556;hpb=e99d83c2d6bdd45a9111eab0306da105c1f2acca;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/defines/source_spec.rb b/spec/defines/source_spec.rb
index 38f5b9d..3436f55 100644
--- a/spec/defines/source_spec.rb
+++ b/spec/defines/source_spec.rb
@@ -120,7 +120,9 @@ describe 'apt::source' do
           location: 'http://debian.mirror.iweb.ca/debian/',
           release: 'sid',
           repos: 'testing',
-          key: { 'id' => GPG_KEY_ID, 'server' => 'pgp.mit.edu',
+          key: { 'ensure' => 'refreshed',
+                 'id' => GPG_KEY_ID,
+                 'server' => 'pgp.mit.edu',
                  'content' => 'GPG key content',
                  'source'  => 'http://apt.puppetlabs.com/pubkey.gpg' },
           pin: '10',
@@ -141,44 +143,13 @@ 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',
+        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: 'refreshed',
                                                                                                                                                     id: GPG_KEY_ID,
                                                                                                                                                     server: 'pgp.mit.edu',
                                                                                                                                                     content: 'GPG key content',
                                                                                                                                                     source: 'http://apt.puppetlabs.com/pubkey.gpg')
       }
     end
-
-    context 'with simple key' do
-      let :params do
-        {
-          comment: 'foo',
-          location: 'http://debian.mirror.iweb.ca/debian/',
-          release: 'sid',
-          repos: 'testing',
-          key: GPG_KEY_ID,
-          pin: '10',
-          architecture: 'x86_64',
-          allow_unsigned: true,
-        }
-      end
-
-      it {
-        is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# foo\ndeb \[arch=x86_64 trusted=yes\] http://debian.mirror.iweb.ca/debian/ sid testing\n})
-                                                             .without_content(%r{deb-src})
-      }
-
-      it {
-        is_expected.to contain_apt__pin('my_source').that_comes_before('Apt::Setting[list-my_source]').with(ensure: 'present',
-                                                                                                            priority: '10',
-                                                                                                            origin: 'debian.mirror.iweb.ca')
-      }
-
-      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',
-                                                                                                                                                    id: GPG_KEY_ID)
-      }
-    end
   end
 
   context 'with allow_unsigned true' do