X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fclasses%2Fapt_spec.rb;h=e46ad050728dcb71fb14e490de3384b0981f6686;hb=59d1f996fa72a6f1f0e24f51468eab14a19e6e41;hp=cd3a6ec7b47f4253418e531179c9804ad5fb5394;hpb=bd3b3fbe990bfa824ebed3504c0c82175d7c7ec9;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb
index cd3a6ec..e46ad05 100644
--- a/spec/classes/apt_spec.rb
+++ b/spec/classes/apt_spec.rb
@@ -1,186 +1,185 @@
 require 'spec_helper'
 describe 'apt' do
   let(:facts) do
-  {
-    :os => { :family => 'Debian', :name => 'Debian', :release => { :major => '7', :full => '7.0' }},
-    :lsbdistid       => 'Debian',
-    :osfamily        => 'Debian',
-    :lsbdistcodename => 'wheezy',
-    :puppetversion   => Puppet.version,
-  }
+    {
+      os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
+      lsbdistid: 'Debian',
+      osfamily: 'Debian',
+      lsbdistcodename: 'wheezy',
+      puppetversion: Puppet.version,
+    }
   end
+
   context 'defaults' do
-    it { is_expected.to contain_file('sources.list').that_notifies('Class[Apt::Update]').only_with({
-      :ensure  => 'file',
-      :path    => '/etc/apt/sources.list',
-      :owner   => 'root',
-      :group   => 'root',
-      :mode    => '0644',
-      :notify  => 'Class[Apt::Update]',
-    })}
-
-    it { is_expected.to contain_file('sources.list.d').that_notifies('Class[Apt::Update]').only_with({
-      :ensure  => 'directory',
-      :path    => '/etc/apt/sources.list.d',
-      :owner   => 'root',
-      :group   => 'root',
-      :mode    => '0644',
-      :purge   => false,
-      :recurse => false,
-      :notify  => 'Class[Apt::Update]',
-    })}
-
-    it { is_expected.to contain_file('preferences').that_notifies('Class[Apt::Update]').only_with({
-      :ensure  => 'file',
-      :path    => '/etc/apt/preferences',
-      :owner   => 'root',
-      :group   => 'root',
-      :mode    => '0644',
-      :notify  => 'Class[Apt::Update]',
-    })}
-
-    it { is_expected.to contain_file('preferences.d').that_notifies('Class[Apt::Update]').only_with({
-      :ensure  => 'directory',
-      :path    => '/etc/apt/preferences.d',
-      :owner   => 'root',
-      :group   => 'root',
-      :mode    => '0644',
-      :purge   => false,
-      :recurse => false,
-      :notify  => 'Class[Apt::Update]',
-    })}
-
-    it 'should lay down /etc/apt/apt.conf.d/15update-stamp' do
-      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";\};/)
+    it {
+      is_expected.to contain_file('sources.list').that_notifies('Class[Apt::Update]').only_with(ensure: 'file',
+                                                                                                path: '/etc/apt/sources.list',
+                                                                                                owner: 'root',
+                                                                                                group: 'root',
+                                                                                                mode: '0644',
+                                                                                                notify: 'Class[Apt::Update]')
+    }
+
+    it {
+      is_expected.to contain_file('sources.list.d').that_notifies('Class[Apt::Update]').only_with(ensure: 'directory',
+                                                                                                  path: '/etc/apt/sources.list.d',
+                                                                                                  owner: 'root',
+                                                                                                  group: 'root',
+                                                                                                  mode: '0644',
+                                                                                                  purge: false,
+                                                                                                  recurse: false,
+                                                                                                  notify: 'Class[Apt::Update]')
+    }
+
+    it {
+      is_expected.to contain_file('preferences').that_notifies('Class[Apt::Update]').only_with(ensure: 'file',
+                                                                                               path: '/etc/apt/preferences',
+                                                                                               owner: 'root',
+                                                                                               group: 'root',
+                                                                                               mode: '0644',
+                                                                                               notify: 'Class[Apt::Update]')
+    }
+
+    it {
+      is_expected.to contain_file('preferences.d').that_notifies('Class[Apt::Update]').only_with(ensure: 'directory',
+                                                                                                 path: '/etc/apt/preferences.d',
+                                                                                                 owner: 'root',
+                                                                                                 group: 'root',
+                                                                                                 mode: '0644',
+                                                                                                 purge: false,
+                                                                                                 recurse: false,
+                                                                                                 notify: 'Class[Apt::Update]')
+    }
+
+    it 'lays down /etc/apt/apt.conf.d/15update-stamp' do
+      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";\};/) # rubocop:disable Metrics/LineLength
     end
 
-    it { is_expected.to contain_exec('apt_update').with({
-      :refreshonly => 'true',
-    })}
+    it {
+      is_expected.to contain_exec('apt_update').with(refreshonly: 'true')
+    }
 
     it { is_expected.not_to contain_apt__setting('conf-proxy') }
   end
 
   describe 'proxy=' do
     context 'host=localhost' do
-      let(:params) { { :proxy => { 'host' => 'localhost'} } }
-      it { is_expected.to contain_apt__setting('conf-proxy').with({
-        :priority => '01',
-      }).with_content(
-        /Acquire::http::proxy "http:\/\/localhost:8080\/";/
-      ).without_content(
-        /Acquire::https::proxy/
-      )}
+      let(:params) { { proxy: { 'host' => 'localhost' } } }
+
+      it {
+        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
+          /Acquire::http::proxy "http:\/\/localhost:8080\/";/,
+        ).without_content(
+          %r{Acquire::https::proxy "DIRECT"},
+        )
+      }
     end
 
     context 'host=localhost and port=8180' do
-      let(:params) { { :proxy => { 'host' => 'localhost', 'port' => 8180} } }
-      it { is_expected.to contain_apt__setting('conf-proxy').with({
-        :priority => '01',
-      }).with_content(
-        /Acquire::http::proxy "http:\/\/localhost:8180\/";/
-      ).without_content(
-        /Acquire::https::proxy/
-      )}
+      let(:params) { { proxy: { 'host' => 'localhost', 'port' => 8180 } } }
+
+      it {
+        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
+          /Acquire::http::proxy "http:\/\/localhost:8180\/";/,
+        ).without_content(
+          %r{Acquire::https::proxy "DIRECT"},
+        )
+      }
     end
 
     context 'host=localhost and https=true' do
-      let(:params) { { :proxy => { 'host' => 'localhost', 'https' => true} } }
-      it { is_expected.to contain_apt__setting('conf-proxy').with({
-        :priority => '01',
-      }).with_content(
-        /Acquire::http::proxy "http:\/\/localhost:8080\/";/
-      ).with_content(
-        /Acquire::https::proxy "https:\/\/localhost:8080\/";/
-      )}
+      let(:params) { { proxy: { 'host' => 'localhost', 'https' => true } } }
+
+      it {
+        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
+          /Acquire::http::proxy "http:\/\/localhost:8080\/";/,
+        ).with_content(
+          /Acquire::https::proxy "https:\/\/localhost:8080\/";/,
+        )
+      }
     end
 
     context 'ensure=absent' do
-      let(:params) { { :proxy => { 'ensure' => 'absent'} } }
-      it { is_expected.to contain_apt__setting('conf-proxy').with({
-        :ensure   => 'absent',
-        :priority => '01',
-      })}
+      let(:params) { { proxy: { 'ensure' => 'absent' } } }
+
+      it {
+        is_expected.to contain_apt__setting('conf-proxy').with(ensure: 'absent',
+                                                               priority: '01')
+      }
     end
   end
   context 'lots of non-defaults' do
     let :params do
       {
-        :update => { 'frequency' => 'always', 'timeout' => 1, 'tries' => 3 },
-        :purge  => { 'sources.list' => false, 'sources.list.d' => false,
-                     'preferences' => false, 'preferences.d' => false, },
+        update: { 'frequency' => 'always', 'timeout' => 1, 'tries' => 3 },
+        purge: { 'sources.list' => false, 'sources.list.d' => false,
+                 'preferences' => false, 'preferences.d' => false },
       }
     end
 
-    it { is_expected.to contain_file('sources.list').with({
-      :content => nil,
-    })}
-
-    it { is_expected.to contain_file('sources.list.d').with({
-      :purge   => false,
-      :recurse => false,
-    })}
+    it {
+      is_expected.to contain_file('sources.list').with(content: nil)
+    }
 
-    it { is_expected.to contain_file('preferences').with({
-      :ensure => 'file',
-    })}
+    it {
+      is_expected.to contain_file('sources.list.d').with(purge: false,
+                                                         recurse: false)
+    }
 
-    it { is_expected.to contain_file('preferences.d').with({
-      :purge   => false,
-      :recurse => false,
-    })}
+    it {
+      is_expected.to contain_file('preferences').with(ensure: 'file')
+    }
 
-    it { is_expected.to contain_exec('apt_update').with({
-      :refreshonly => false,
-      :timeout     => 1,
-      :tries       => 3,
-    })}
+    it {
+      is_expected.to contain_file('preferences.d').with(purge: false,
+                                                        recurse: false)
+    }
 
+    it {
+      is_expected.to contain_exec('apt_update').with(refreshonly: false,
+                                                     timeout: 1,
+                                                     tries: 3)
+    }
   end
 
   context 'with sources defined on valid osfamily' do
     let :facts do
-      { :os => { :family => 'Debian', :name => 'Ubuntu', :release => { :major => '12', :full => '12.04' }},
-        :osfamily        => 'Debian',
-        :lsbdistcodename => 'precise',
-        :lsbdistid       => 'Ubuntu',
-        :lsbdistrelease  => '12.04',
-        :puppetversion   => Puppet.version,
-      }
+      { os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04' } },
+        osfamily: 'Debian',
+        lsbdistcodename: 'precise',
+        lsbdistid: 'Ubuntu',
+        lsbdistrelease: '12.04',
+        puppetversion: Puppet.version }
+    end
+    let(:params) do
+      { sources: {
+        'debian_unstable' => {
+          'location'          => 'http://debian.mirror.iweb.ca/debian/',
+          'release'           => 'unstable',
+          'repos'             => 'main contrib non-free',
+          'key'               => { 'id' => '150C8614919D8446E01E83AF9AA38DCD55BE302B', 'server' => 'subkeys.pgp.net' },
+          'pin'               => '-10',
+          'include'           => { 'src' => true },
+        },
+        'puppetlabs' => {
+          'location' => 'http://apt.puppetlabs.com',
+          'repos'      => 'main',
+          'key'        => { 'id' => '6F6B15509CF8E59E6E469F327F438280EF8D349F', 'server' => 'pgp.mit.edu' },
+        },
+      } }
     end
-    let(:params) { { :sources => {
-      'debian_unstable' => {
-        'location'          => 'http://debian.mirror.iweb.ca/debian/',
-        'release'           => 'unstable',
-        'repos'             => 'main contrib non-free',
-        'key'               => { 'id' => '150C8614919D8446E01E83AF9AA38DCD55BE302B', 'server' => 'subkeys.pgp.net' },
-        'pin'               => '-10',
-        'include'           => {'src' => true,},
-      },
-      'puppetlabs' => {
-        'location'   => 'http://apt.puppetlabs.com',
-        'repos'      => 'main',
-        'key'        => { 'id' => '6F6B15509CF8E59E6E469F327F438280EF8D349F', 'server' => 'pgp.mit.edu' },
-      }
-    } } }
 
     it {
-      is_expected.to contain_apt__setting('list-debian_unstable').with({
-        :ensure => 'present',
-      })
+      is_expected.to contain_apt__setting('list-debian_unstable').with(ensure: 'present')
     }
 
     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 {
-      is_expected.to contain_apt__setting('list-puppetlabs').with({
-        :ensure => 'present',
-      })
+      is_expected.to contain_apt__setting('list-puppetlabs').with(ensure: 'present')
     }
 
     it { is_expected.to contain_file('/etc/apt/sources.list.d/puppetlabs.list').with_content(/^deb http:\/\/apt.puppetlabs.com precise main$/) }
@@ -189,112 +188,122 @@ describe 'apt' do
   context 'with confs defined on valid osfamily' do
     let :facts do
       {
-        :os => { :family => 'Debian', :name => 'Ubuntu', :release => { :major => '12', :full => '12.04.5' }},
-        :osfamily        => 'Debian',
-        :lsbdistcodename => 'precise',
-        :lsbdistid       => 'Debian',
-        :puppetversion   => Puppet.version,
+        os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } },
+        osfamily: 'Debian',
+        lsbdistcodename: 'precise',
+        lsbdistid: 'Debian',
+        puppetversion: Puppet.version,
       }
     end
-    let(:params) { { :confs => {
-      'foo' => {
-        'content' => 'foo',
-      },
-      'bar' => {
-        'content' => 'bar',
-      }
-    } } }
+    let(:params) do
+      { confs: {
+        'foo' => {
+          'content' => 'foo',
+        },
+        'bar' => {
+          'content' => 'bar',
+        },
+      } }
+    end
 
-    it { is_expected.to contain_apt__conf('foo').with({
-        :content => 'foo',
-    })}
+    it {
+      is_expected.to contain_apt__conf('foo').with(content: 'foo')
+    }
 
-    it { is_expected.to contain_apt__conf('bar').with({
-        :content => 'bar',
-    })}
+    it {
+      is_expected.to contain_apt__conf('bar').with(content: 'bar')
+    }
   end
 
   context 'with keys defined on valid osfamily' do
     let :facts do
       {
-        :os => { :family => 'Debian', :name => 'Ubuntu', :release => { :major => '12', :full => '12.04.5' }},
-        :osfamily        => 'Debian',
-        :lsbdistcodename => 'precise',
-        :lsbdistid       => 'Debian',
-        :puppetversion   => Puppet.version,
+        os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } },
+        osfamily: 'Debian',
+        lsbdistcodename: 'precise',
+        lsbdistid: 'Debian',
+        puppetversion: Puppet.version,
       }
     end
-    let(:params) { { :keys => {
-      '55BE302B' => {
-        'server' => 'subkeys.pgp.net',
-      },
-      'EF8D349F' => {
-        'server' => 'pgp.mit.edu',
-      }
-    } } }
+    let(:params) do
+      { keys: {
+        '55BE302B' => {
+          'server' => 'subkeys.pgp.net',
+        },
+        'EF8D349F' => {
+          'server' => 'pgp.mit.edu',
+        },
+      } }
+    end
 
-    it { is_expected.to contain_apt__key('55BE302B').with({
-        :server => 'subkeys.pgp.net',
-    })}
+    it {
+      is_expected.to contain_apt__key('55BE302B').with(server: 'subkeys.pgp.net')
+    }
 
-    it { is_expected.to contain_apt__key('EF8D349F').with({
-        :server => 'pgp.mit.edu',
-    })}
+    it {
+      is_expected.to contain_apt__key('EF8D349F').with(server: 'pgp.mit.edu')
+    }
   end
 
   context 'with ppas defined on valid osfamily' do
     let :facts do
       {
-        :os => { :family => 'Debian', :name => 'Ubuntu', :release => { :major => '12', :full => '12.04.5' }},
-        :osfamily        => 'Debian',
-        :lsbdistcodename => 'precise',
-        :lsbdistid       => 'ubuntu',
-        :lsbdistrelease  => '12.04',
-        :puppetversion   => Puppet.version,
+        os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } },
+        osfamily: 'Debian',
+        lsbdistcodename: 'precise',
+        lsbdistid: 'ubuntu',
+        lsbdistrelease: '12.04',
+        puppetversion: Puppet.version,
       }
     end
-    let(:params) { { :ppas => {
-      'ppa:drizzle-developers/ppa' => {},
-      'ppa:nginx/stable' => {},
-    } } }
+    let(:params) do
+      { ppas: {
+        'ppa:drizzle-developers/ppa' => {},
+        'ppa:nginx/stable' => {},
+      } }
+    end
 
-    it { is_expected.to contain_apt__ppa('ppa:drizzle-developers/ppa')}
-    it { is_expected.to contain_apt__ppa('ppa:nginx/stable')}
+    it { is_expected.to contain_apt__ppa('ppa:drizzle-developers/ppa') }
+    it { is_expected.to contain_apt__ppa('ppa:nginx/stable') }
   end
 
   context 'with settings defined on valid osfamily' do
     let :facts do
       {
-        :os => { :family => 'Debian', :name => 'Ubuntu', :release => { :major => '12', :full => '12.04.5' }},
-        :osfamily        => 'Debian',
-        :lsbdistcodename => 'precise',
-        :lsbdistid       => 'Debian',
-        :puppetversion   => Puppet.version,
+        os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } },
+        osfamily: 'Debian',
+        lsbdistcodename: 'precise',
+        lsbdistid: 'Debian',
+        puppetversion: Puppet.version,
       }
     end
-    let(:params) { { :settings => {
-      'conf-banana' => { 'content' => 'banana' },
-      'pref-banana' => { 'content' => 'banana' },
-    } } }
+    let(:params) do
+      { settings: {
+        'conf-banana' => { 'content' => 'banana' },
+        'pref-banana' => { 'content' => 'banana' },
+      } }
+    end
 
-    it { is_expected.to contain_apt__setting('conf-banana')}
-    it { is_expected.to contain_apt__setting('pref-banana')}
+    it { is_expected.to contain_apt__setting('conf-banana') }
+    it { is_expected.to contain_apt__setting('pref-banana') }
   end
 
   context 'with pins defined on valid osfamily' do
     let :facts do
       {
-        :os => { :family => 'Debian', :name => 'Ubuntu', :release => { :major => '12', :full => '12.04.5' }},
-        :osfamily        => 'Debian',
-        :lsbdistcodename => 'precise',
-        :lsbdistid       => 'Debian',
-        :puppetversion   => Puppet.version,
+        os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } },
+        osfamily: 'Debian',
+        lsbdistcodename: 'precise',
+        lsbdistid: 'Debian',
+        puppetversion: Puppet.version,
       }
     end
-    let(:params) { { :pins => {
-      'stable' => { 'priority' => 600, 'order' => 50 },
-      'testing' =>  { 'priority' => 700, 'order' => 100 },
-    } } }
+    let(:params) do
+      { pins: {
+        'stable' => { 'priority' => 600, 'order' => 50 },
+        'testing' =>  { 'priority' => 700, 'order' => 100 },
+      } }
+    end
 
     it { is_expected.to contain_apt__pin('stable') }
     it { is_expected.to contain_apt__pin('testing') }
@@ -302,7 +311,8 @@ describe 'apt' do
 
   describe 'failing tests' do
     context "purge['sources.list']=>'banana'" do
-      let(:params) { { :purge => { 'sources.list' => 'banana' }, } }
+      let(:params) { { purge: { 'sources.list' => 'banana' } } }
+
       it do
         expect {
           subject.call
@@ -311,7 +321,8 @@ describe 'apt' do
     end
 
     context "purge['sources.list.d']=>'banana'" do
-      let(:params) { { :purge => { 'sources.list.d' => 'banana' }, } }
+      let(:params) { { purge: { 'sources.list.d' => 'banana' } } }
+
       it do
         expect {
           subject.call
@@ -320,7 +331,8 @@ describe 'apt' do
     end
 
     context "purge['preferences']=>'banana'" do
-      let(:params) { { :purge => { 'preferences' => 'banana' }, } }
+      let(:params) { { purge: { 'preferences' => 'banana' } } }
+
       it do
         expect {
           subject.call
@@ -329,7 +341,8 @@ describe 'apt' do
     end
 
     context "purge['preferences.d']=>'banana'" do
-      let(:params) { { :purge => { 'preferences.d' => 'banana' }, } }
+      let(:params) { { purge: { 'preferences.d' => 'banana' } } }
+
       it do
         expect {
           subject.call