Merge branch 'proxy'

[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 ac626d291ef2d27f746a577268410086bebaec32..a66feac78810ce3175580a2dd5ee4b7298fcd2ea 100644 (file)
--- a/spec/classes/apt_spec.rb
+++ b/spec/classes/apt_spec.rb
@@ -41,8 +41,6 @@ describe 'apt', :type => :class do
 
       it { should include_class("apt::params") }
 
-      it { should contain_package("python-software-properties") }
-
       it {
         if param_hash[:purge_sources_list]
         should contain_file("sources.list").with({
@@ -122,15 +120,14 @@ describe 'apt', :type => :class do
               'notify'  => "Exec[apt_update]"
             )
           else
-            should_not contain_file('configure_apt_proxy')
+            should contain_file('configure-apt-proxy').with(
+              'path'    => '/etc/apt/apt.conf.d/proxy',
+              'notify'  => 'Exec[apt_update]',
+              'ensure'  => 'absent'
+            )
           end
         }
       end
     end
   end
-
-  describe "it should not error if package['python-software-properties'] is already defined" do
-    let(:pre_condition) { 'package { "python-software-properties": }->Class["Apt"]' }
-    it { should contain_package("python-software-properties") }
-  end
 end