X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fclasses%2Fapt_spec.rb;h=b8ff37ea312caee1153a9c574c73b2520c9b4723;hb=b6c70b70e72df46a5884926c0a2c42b8503bb149;hp=0a1c0a1bd79e4a62cfd2472337fae3b31800949b;hpb=5d96da0c6aac8f0f9192fe6ce63548bdaee149b5;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb
index 0a1c0a1..b8ff37e 100644
--- a/spec/classes/apt_spec.rb
+++ b/spec/classes/apt_spec.rb
@@ -3,7 +3,7 @@ describe 'apt', :type => :class do
   let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian' } }
 
   context 'defaults' do
-    it { should contain_file('sources.list').that_notifies('Exec[apt_update]').only_with({
+    it { is_expected.to contain_file('sources.list').that_notifies('Exec[apt_update]').only_with({
       'ensure' => 'present',
       'path'   => '/etc/apt/sources.list',
       'owner'  => 'root',
@@ -12,7 +12,7 @@ describe 'apt', :type => :class do
       'notify' => 'Exec[apt_update]',
     })}
 
-    it { should contain_file('sources.list.d').that_notifies('Exec[apt_update]').only_with({
+    it { is_expected.to contain_file('sources.list.d').that_notifies('Exec[apt_update]').only_with({
       'ensure'  => 'directory',
       'path'    => '/etc/apt/sources.list.d',
       'owner'   => 'root',
@@ -22,7 +22,7 @@ describe 'apt', :type => :class do
       'notify'  => 'Exec[apt_update]',
     })}
 
-    it { should contain_file('preferences.d').only_with({
+    it { is_expected.to contain_file('preferences.d').only_with({
       'ensure'  => 'directory',
       'path'    => '/etc/apt/preferences.d',
       'owner'   => 'root',
@@ -31,27 +31,15 @@ describe 'apt', :type => :class do
       'recurse' => false,
     })}
 
-    it { should contain_file('01proxy').that_notifies('Exec[apt_update]').only_with({
-      'ensure' => 'absent',
-      'path'   => '/etc/apt/apt.conf.d/01proxy',
-      'notify' => 'Exec[apt_update]',
-    })}
-
     it 'should lay down /etc/apt/apt.conf.d/15update-stamp' do
-      should contain_file('/etc/apt/apt.conf.d/15update-stamp').with({
+      is_expected.to contain_file('/etc/apt/apt.conf.d/15update-stamp').with({
         'group' => 'root',
         'mode'  => '0644',
         'owner' => 'root',
-      }).with_content('APT::Update::Post-Invoke-Success {"touch /var/lib/apt/periodic/update-success-stamp 2>/dev/null || true";};')
+      }).with_content(/APT::Update::Post-Invoke-Success \{"touch \/var\/lib\/apt\/periodic\/update-success-stamp 2>\/dev\/null \|\| true";\};/)
     end
 
-    it { should contain_file('old-proxy-file').that_notifies('Exec[apt_update]').only_with({
-      'ensure' => 'absent',
-      'path'   => '/etc/apt/apt.conf.d/proxy',
-      'notify' => 'Exec[apt_update]',
-    })}
-
-    it { should contain_exec('apt_update').with({
+    it { is_expected.to contain_exec('apt_update').with({
       'refreshonly' => 'true',
     })}
   end
@@ -60,61 +48,35 @@ describe 'apt', :type => :class do
     let :params do
       {
         :always_apt_update    => true,
-        :disable_keys         => true,
-        :proxy_host           => 'foo',
-        :proxy_port           => '9876',
         :purge_sources_list   => true,
         :purge_sources_list_d => true,
         :purge_preferences    => true,
         :purge_preferences_d  => true,
         :update_timeout       => '1',
         :update_tries         => '3',
-        :fancy_progress       => true,
       }
     end
 
-    it { should contain_file('sources.list').with({
+    it { is_expected.to contain_file('sources.list').with({
       'content' => "# Repos managed by puppet.\n"
     })}
 
-    it { should contain_file('sources.list.d').with({
+    it { is_expected.to contain_file('sources.list.d').with({
       'purge'   => 'true',
       'recurse' => 'true',
     })}
 
-    it { should contain_file('apt-preferences').only_with({
+    it { is_expected.to contain_file('apt-preferences').only_with({
       'ensure' => 'absent',
       'path'   => '/etc/apt/preferences',
     })}
 
-    it { should contain_file('preferences.d').with({
+    it { is_expected.to contain_file('preferences.d').with({
       'purge'   => 'true',
       'recurse' => 'true',
     })}
 
-    it { should contain_file('99progressbar').only_with({
-      'ensure'  => 'present',
-      'content' => 'Dpkg::Progress-Fancy "1";',
-      'path'    => '/etc/apt/apt.conf.d/99progressbar',
-    })}
-
-    it { should contain_file('99unauth').only_with({
-      'ensure'  => 'present',
-      'content' => "APT::Get::AllowUnauthenticated 1;\n",
-      'path'    => '/etc/apt/apt.conf.d/99unauth',
-    })}
-
-    it { should contain_file('01proxy').that_notifies('Exec[apt_update]').only_with({
-      'ensure'  => 'present',
-      'path'    => '/etc/apt/apt.conf.d/01proxy',
-      'content' => "Acquire::http::Proxy \"http://foo:9876\";\n",
-      'notify'  => 'Exec[apt_update]',
-      'mode'    => '0644',
-      'owner'   => 'root',
-      'group'   => 'root'
-    })}
-
-    it { should contain_exec('apt_update').with({
+    it { is_expected.to contain_exec('apt_update').with({
       'refreshonly' => 'false',
       'timeout'     => '1',
       'tries'       => '3',
@@ -122,26 +84,6 @@ describe 'apt', :type => :class do
 
   end
 
-  context 'more non-default' do
-    let :params do
-      {
-        :fancy_progress => false,
-        :disable_keys   => false,
-      }
-    end
-
-    it { should contain_file('99progressbar').only_with({
-      'ensure'  => 'absent',
-      'path'    => '/etc/apt/apt.conf.d/99progressbar',
-    })}
-
-    it { should contain_file('99unauth').only_with({
-      'ensure'  => 'absent',
-      'path'    => '/etc/apt/apt.conf.d/99unauth',
-    })}
-
-  end
-
   context 'with sources defined on valid osfamily' do
     let :facts do
       { :osfamily        => 'Debian',
@@ -154,7 +96,6 @@ describe 'apt', :type => :class do
         'location'          => 'http://debian.mirror.iweb.ca/debian/',
         'release'           => 'unstable',
         'repos'             => 'main contrib non-free',
-        'required_packages' => 'debian-keyring debian-archive-keyring',
         'key'               => '55BE302B',
         'key_server'        => 'subkeys.pgp.net',
         'pin'               => '-10',
@@ -169,32 +110,21 @@ describe 'apt', :type => :class do
     } } }
 
     it {
-      should contain_file('debian_unstable.list').with({
+      is_expected.to contain_apt__setting('list-debian_unstable').with({
         'ensure'  => 'present',
-        'path'    => '/etc/apt/sources.list.d/debian_unstable.list',
-        'owner'   => 'root',
-        'group'   => 'root',
-        'mode'    => '0644',
-        'notify'  => 'Exec[apt_update]',
       })
     }
 
-    it { should contain_file('debian_unstable.list').with_content(/^deb http:\/\/debian.mirror.iweb.ca\/debian\/ unstable main contrib non-free$/) }
-    it { should contain_file('debian_unstable.list').with_content(/^deb-src http:\/\/debian.mirror.iweb.ca\/debian\/ unstable main contrib non-free$/) }
+    it { is_expected.to contain_file('/etc/apt/sources.list.d/debian_unstable.list').with_content(/^deb http:\/\/debian.mirror.iweb.ca\/debian\/ unstable main contrib non-free$/) }
+    it { is_expected.to contain_file('/etc/apt/sources.list.d/debian_unstable.list').with_content(/^deb-src http:\/\/debian.mirror.iweb.ca\/debian\/ unstable main contrib non-free$/) }
 
     it {
-      should contain_file('puppetlabs.list').with({
+      is_expected.to contain_apt__setting('list-puppetlabs').with({
         'ensure'  => 'present',
-        'path'    => '/etc/apt/sources.list.d/puppetlabs.list',
-        'owner'   => 'root',
-        'group'   => 'root',
-        'mode'    => '0644',
-        'notify'  => 'Exec[apt_update]',
       })
     }
 
-    it { should contain_file('puppetlabs.list').with_content(/^deb http:\/\/apt.puppetlabs.com precise main$/) }
-    it { should contain_file('puppetlabs.list').with_content(/^deb-src http:\/\/apt.puppetlabs.com precise main$/) }
+    it { is_expected.to contain_file('/etc/apt/sources.list.d/puppetlabs.list').with_content(/^deb http:\/\/apt.puppetlabs.com precise main$/) }
   end
 
   describe 'failing tests' do
@@ -206,7 +136,7 @@ describe 'apt', :type => :class do
       end
       it do
         expect {
-          should compile
+          is_expected.to compile
         }.to raise_error(Puppet::Error)
       end
     end
@@ -219,7 +149,7 @@ describe 'apt', :type => :class do
       end
       it do
         expect {
-          should compile
+          is_expected.to compile
         }.to raise_error(Puppet::Error)
       end
     end
@@ -232,7 +162,7 @@ describe 'apt', :type => :class do
       end
       it do
         expect {
-          should compile
+          is_expected.to compile
         }.to raise_error(Puppet::Error)
       end
     end
@@ -245,7 +175,7 @@ describe 'apt', :type => :class do
       end
       it do
         expect {
-          should compile
+          is_expected.to compile
         }.to raise_error(Puppet::Error)
       end
     end
@@ -257,7 +187,7 @@ describe 'apt', :type => :class do
 
       it do
         expect {
-          should compile
+          is_expected.to compile
         }.to raise_error(Puppet::Error, /This module only works on Debian or derivatives like Ubuntu/)
       end
     end