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 4d44bcc78c726f528c324921882e5362e186de4e..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({
@@ -73,7 +71,7 @@ describe 'apt', :type => :class do
             'group'   => "root",
             'purge'   => true,
             'recurse' => true,
-            'notify'  => 'Exec[apt update]'
+            'notify'  => 'Exec[apt_update]'
           })
         else
           should create_file("sources.list.d").with({
@@ -83,13 +81,13 @@ describe 'apt', :type => :class do
             'group'   => "root",
             'purge'   => false,
             'recurse' => false,
-            'notify'  => 'Exec[apt update]'
+            'notify'  => 'Exec[apt_update]'
           })
         end
       }
 
       it {
-        should contain_exec("apt update").with({
+        should contain_exec("apt_update").with({
           'command'     => "/usr/bin/apt-get update",
           'refreshonly' => refresh_only_apt_update
         })
@@ -119,18 +117,17 @@ describe 'apt', :type => :class do
             should contain_file('configure-apt-proxy').with(
               'path'    => '/etc/apt/apt.conf.d/proxy',
               'content' => "Acquire::http::Proxy \"http://#{param_hash[:proxy_host]}:#{param_hash[:proxy_port]}\";",
-              'notify'  => "Exec[apt update]"
+              '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