X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fdefines%2Fsource_spec.rb;h=7a1cac321a0502471dfef8a8497e0d4b5f250c88;hb=bb3a1f0af06febbae96effd048448f03e4c87d7e;hp=b4d379902ddf49fb1bf37865c64ecbdc0138217f;hpb=95bed8902f31bf84947c4951872f712b3cbd6741;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/defines/source_spec.rb b/spec/defines/source_spec.rb
index b4d3799..7a1cac3 100644
--- a/spec/defines/source_spec.rb
+++ b/spec/defines/source_spec.rb
@@ -3,6 +3,9 @@ require 'spec_helper'
 describe 'apt::source', :type => :define do
   GPG_KEY_ID = '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30'
 
+  let :pre_condition do
+    'class { "apt": }'
+  end
 
   let :title do
     'my_source'
@@ -29,7 +32,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
 
@@ -48,7 +51,6 @@ describe 'apt::source', :type => :define do
         'release'           => 'sid',
         'repos'             => 'testing',
         'include_src'       => false,
-        'required_packages' => 'vim',
         'key'               => GPG_KEY_ID,
         'key_server'        => 'pgp.mit.edu',
         'key_content'       => 'GPG key content',
@@ -65,7 +67,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({
@@ -75,15 +77,6 @@ describe 'apt::source', :type => :define do
     })
     }
 
-    it { is_expected.to contain_exec("Required packages: 'vim' for my_source").that_comes_before('Exec[apt_update]').that_subscribes_to('File[my_source.list]').with({
-      'command'     => '/usr/bin/apt-get -y install vim',
-      'logoutput'   => 'on_failure',
-      'refreshonly' => true,
-      'tries'       => '3',
-      'try_sleep'   => '1',
-    })
-    }
-
     it { is_expected.to contain_apt__key("Add key: #{GPG_KEY_ID} from Apt::Source my_source").that_comes_before('File[my_source.list]').with({
       'ensure' => 'present',
         'key'  => GPG_KEY_ID,
@@ -115,7 +108,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
 
@@ -140,7 +133,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