X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fclasses%2Fapt_spec.rb;h=0e6b6b07da12aa89f9e905544095b6c2d746d81a;hb=3cff22c493a803b407f7dfd4277d33624877c69f;hp=b7ef6b5d1c43b21078cad6bb0bc7004cf587fdc1;hpb=a4609826c3dc663c2ebb5402ffe7b8a1ea1ecd4f;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb
index b7ef6b5..0e6b6b0 100644
--- a/spec/classes/apt_spec.rb
+++ b/spec/classes/apt_spec.rb
@@ -46,48 +46,48 @@ describe 'apt' do
         name: 'Debian',
         release: {
           major: '9',
-          full: '9.0',
+          full: '9.0'
         },
         distro: {
           codename: 'stretch',
-          id: 'Debian',
-        },
-      },
+          id: 'Debian'
+        }
+      }
     }
   end
 
   context 'with defaults' do
     it {
-      is_expected.to contain_file('sources.list').that_notifies('Class[Apt::Update]').only_with(sources_list)
+      expect(subject).to contain_file('sources.list').that_notifies('Class[Apt::Update]').only_with(sources_list)
     }
 
     it {
-      is_expected.to contain_file('sources.list.d').that_notifies('Class[Apt::Update]').only_with(sources_list_d)
+      expect(subject).to contain_file('sources.list.d').that_notifies('Class[Apt::Update]').only_with(sources_list_d)
     }
 
     it {
-      is_expected.to contain_file('preferences').that_notifies('Class[Apt::Update]').only_with(preferences)
+      expect(subject).to contain_file('preferences').that_notifies('Class[Apt::Update]').only_with(preferences)
     }
 
     it {
-      is_expected.to contain_file('preferences.d').that_notifies('Class[Apt::Update]').only_with(preferences_d)
+      expect(subject).to contain_file('preferences.d').that_notifies('Class[Apt::Update]').only_with(preferences_d)
     }
 
     it {
-      is_expected.to contain_file('apt.conf.d').that_notifies('Class[Apt::Update]').only_with(apt_conf_d)
+      expect(subject).to contain_file('apt.conf.d').that_notifies('Class[Apt::Update]').only_with(apt_conf_d)
     }
 
     it { is_expected.to contain_file('/etc/apt/auth.conf').with_ensure('absent') }
 
     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',
-                                                                             owner: 'root').with_content(
-                                                                               %r{APT::Update::Post-Invoke-Success {"touch /var/lib/apt/periodic/update-success-stamp 2>/dev/null || true";};},
-                                                                             )
+      expect(subject).to contain_file('/etc/apt/apt.conf.d/15update-stamp').with(group: 'root',
+                                                                                 owner: 'root').with_content(
+                                                                                   %r{APT::Update::Post-Invoke-Success {"touch /var/lib/apt/periodic/update-success-stamp 2>/dev/null || true";};},
+                                                                                 )
     end
 
     it {
-      is_expected.to contain_exec('apt_update').with(refreshonly: 'true')
+      expect(subject).to contain_exec('apt_update').with(refreshonly: 'true')
     }
 
     it { is_expected.not_to contain_apt__setting('conf-proxy') }
@@ -98,7 +98,7 @@ describe 'apt' do
       let(:params) { { proxy: { 'host' => 'localhost' } } }
 
       it {
-        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
+        expect(subject).to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
           %r{Acquire::http::proxy "http://localhost:8080/";},
         ).without_content(
           %r{Acquire::https::proxy },
@@ -110,7 +110,7 @@ describe 'apt' do
       let(:params) { { proxy: { 'host' => 'localhost', 'perhost' => [{ 'scope' => 'proxyscope', 'host' => 'proxyhost' }] } } }
 
       it {
-        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
+        expect(subject).to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
           %r{Acquire::http::proxy::proxyscope "http://proxyhost:8080/";},
         )
       }
@@ -120,7 +120,7 @@ describe 'apt' do
       let(:params) { { proxy: { 'host' => 'localhost', 'perhost' => [{ 'scope' => 'proxyscope', 'host' => 'proxyhost', 'port' => 8081 }] } } }
 
       it {
-        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
+        expect(subject).to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
           %r{Acquire::http::proxy::proxyscope "http://proxyhost:8081/";},
         )
       }
@@ -130,7 +130,7 @@ describe 'apt' do
       let(:params) { { proxy: { 'host' => 'localhost', 'perhost' => [{ 'scope' => 'proxyscope', 'host' => 'proxyhost', 'https' => true }] } } }
 
       it {
-        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
+        expect(subject).to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
           %r{Acquire::https::proxy::proxyscope "https://proxyhost:8080/";},
         )
       }
@@ -140,7 +140,7 @@ describe 'apt' do
       let(:params) { { proxy: { 'host' => 'localhost', 'perhost' => [{ 'scope' => 'proxyscope', 'direct' => true }] } } }
 
       it {
-        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
+        expect(subject).to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
           %r{Acquire::http::proxy::proxyscope "DIRECT";},
         )
       }
@@ -150,7 +150,7 @@ describe 'apt' do
       let(:params) { { proxy: { 'host' => 'localhost', 'perhost' => [{ 'scope' => 'proxyscope', 'https' => true, 'direct' => true }] } } }
 
       it {
-        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
+        expect(subject).to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
           %r{Acquire::https::proxy::proxyscope "DIRECT";},
         )
       }
@@ -160,7 +160,7 @@ describe 'apt' do
       let(:params) { { proxy: { 'host' => 'localhost', 'perhost' => [{ 'scope' => 'proxyscope', 'host' => 'proxyhost' }, { 'scope' => 'proxyscope2', 'host' => 'proxyhost2' }] } } }
 
       it {
-        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
+        expect(subject).to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
           %r{Acquire::http::proxy::proxyscope "http://proxyhost:8080/";},
         ).with_content(
           %r{Acquire::http::proxy::proxyscope2 "http://proxyhost2:8080/";},
@@ -172,7 +172,7 @@ describe 'apt' do
       let(:params) { { proxy: { 'host' => 'localhost', 'port' => 8180 } } }
 
       it {
-        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
+        expect(subject).to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
           %r{Acquire::http::proxy "http://localhost:8180/";},
         ).without_content(
           %r{Acquire::https::proxy },
@@ -184,7 +184,7 @@ describe 'apt' do
       let(:params) { { proxy: { 'host' => 'localhost', 'https' => true } } }
 
       it {
-        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
+        expect(subject).to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
           %r{Acquire::http::proxy "http://localhost:8080/";},
         ).with_content(
           %r{Acquire::https::proxy "https://localhost:8080/";},
@@ -196,7 +196,7 @@ describe 'apt' do
       let(:params) { { proxy: { 'host' => 'localhost', 'direct' => true } } }
 
       it {
-        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
+        expect(subject).to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
           %r{Acquire::http::proxy "http://localhost:8080/";},
         ).with_content(
           %r{Acquire::https::proxy "DIRECT";},
@@ -208,14 +208,15 @@ describe 'apt' do
       let(:params) { { proxy: { 'host' => 'localhost', 'https' => true, 'direct' => true } } }
 
       it {
-        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
+        expect(subject).to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
           %r{Acquire::http::proxy "http://localhost:8080/";},
         ).with_content(
           %r{Acquire::https::proxy "https://localhost:8080/";},
         )
       }
+
       it {
-        is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
+        expect(subject).to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
           %r{Acquire::http::proxy "http://localhost:8080/";},
         ).without_content(
           %r{Acquire::https::proxy "DIRECT";},
@@ -227,48 +228,49 @@ describe 'apt' do
       let(:params) { { proxy: { 'ensure' => 'absent' } } }
 
       it {
-        is_expected.to contain_apt__setting('conf-proxy').with(ensure: 'absent',
-                                                               priority: '01')
+        expect(subject).to contain_apt__setting('conf-proxy').with(ensure: 'absent',
+                                                                   priority: '01')
       }
     end
   end
+
   context 'with 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,
-                 'apt.conf.d' => false },
+                 'apt.conf.d' => false }
       }
     end
 
     it {
-      is_expected.to contain_file('sources.list').with(content: nil)
+      expect(subject).to contain_file('sources.list').with(content: nil)
     }
 
     it {
-      is_expected.to contain_file('sources.list.d').with(purge: false,
-                                                         recurse: false)
+      expect(subject).to contain_file('sources.list.d').with(purge: false,
+                                                             recurse: false)
     }
 
     it {
-      is_expected.to contain_file('preferences').with(ensure: 'file')
+      expect(subject).to contain_file('preferences').with(ensure: 'file')
     }
 
     it {
-      is_expected.to contain_file('preferences.d').with(purge: false,
-                                                        recurse: false)
+      expect(subject).to contain_file('preferences.d').with(purge: false,
+                                                            recurse: false)
     }
 
     it {
-      is_expected.to contain_file('apt.conf.d').with(purge: false,
-                                                     recurse: false)
+      expect(subject).to contain_file('apt.conf.d').with(purge: false,
+                                                         recurse: false)
     }
 
     it {
-      is_expected.to contain_exec('apt_update').with(refreshonly: false,
-                                                     timeout: 1,
-                                                     tries: 3)
+      expect(subject).to contain_exec('apt_update').with(refreshonly: false,
+                                                         timeout: 1,
+                                                         tries: 3)
     }
   end
 
@@ -278,37 +280,37 @@ describe 'apt' do
         update: { 'frequency' => 'always', 'timeout' => 1, 'tries' => 3 },
         purge: { 'sources.list' => true, 'sources.list.d' => true,
                  'preferences' => true, 'preferences.d' => true,
-                 'apt.conf.d' => true },
+                 'apt.conf.d' => true }
       }
     end
 
     it {
-      is_expected.to contain_file('sources.list').with(content: "# Repos managed by puppet.\n")
+      expect(subject).to contain_file('sources.list').with(content: "# Repos managed by puppet.\n")
     }
 
     it {
-      is_expected.to contain_file('sources.list.d').with(purge: true,
-                                                         recurse: true)
+      expect(subject).to contain_file('sources.list.d').with(purge: true,
+                                                             recurse: true)
     }
 
     it {
-      is_expected.to contain_file('preferences').with(ensure: 'absent')
+      expect(subject).to contain_file('preferences').with(ensure: 'absent')
     }
 
     it {
-      is_expected.to contain_file('preferences.d').with(purge: true,
-                                                        recurse: true)
+      expect(subject).to contain_file('preferences.d').with(purge: true,
+                                                            recurse: true)
     }
 
     it {
-      is_expected.to contain_file('apt.conf.d').with(purge: true,
-                                                     recurse: true)
+      expect(subject).to contain_file('apt.conf.d').with(purge: true,
+                                                         recurse: true)
     }
 
     it {
-      is_expected.to contain_exec('apt_update').with(refreshonly: false,
-                                                     timeout: 1,
-                                                     tries: 3)
+      expect(subject).to contain_exec('apt_update').with(refreshonly: false,
+                                                         timeout: 1,
+                                                         tries: 3)
     }
   end
 
@@ -317,12 +319,12 @@ describe 'apt' do
       {
         update: { 'frequency' => 'always', 'timeout' => 1, 'tries' => 3 },
         purge: { 'sources.list' => true },
-        sources_list_force: false,
+        sources_list_force: false
       }
     end
 
     it {
-      is_expected.to contain_file('sources.list').with(content: "# Repos managed by puppet.\n")
+      expect(subject).to contain_file('sources.list').with(content: "# Repos managed by puppet.\n")
     }
   end
 
@@ -331,12 +333,12 @@ describe 'apt' do
       {
         update: { 'frequency' => 'always', 'timeout' => 1, 'tries' => 3 },
         purge: { 'sources.list' => true },
-        sources_list_force: true,
+        sources_list_force: true
       }
     end
 
     it {
-      is_expected.to contain_file('sources.list').with(ensure: 'absent')
+      expect(subject).to contain_file('sources.list').with(ensure: 'absent')
     }
   end
 
@@ -348,13 +350,13 @@ describe 'apt' do
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'bionic',
-            id: 'Ubuntu',
-          },
-        },
+            id: 'Ubuntu'
+          }
+        }
       },
       'Debian 9.0' => {
         os: {
@@ -362,13 +364,13 @@ describe 'apt' do
           name: 'Debian',
           release: {
             major: '9',
-            full: '9.0',
+            full: '9.0'
           },
           distro: {
             codename: 'stretch',
-            id: 'Debian',
-          },
-        },
+            id: 'Debian'
+          }
+        }
       },
       'Debian 10.0' => {
         os: {
@@ -376,14 +378,14 @@ describe 'apt' do
           name: 'Debian',
           release: {
             major: '10',
-            full: '10.0',
+            full: '10.0'
           },
           distro: {
             codename: 'buster',
-            id: 'Debian',
-          },
-        },
-      },
+            id: 'Debian'
+          }
+        }
+      }
     }
 
     facts_hash.each do |os, facts|
@@ -397,14 +399,14 @@ describe 'apt' do
               {
                 machine: 'deb.example.net',
                 login: 'foologin',
-                password: 'secret',
+                password: 'secret'
               },
               {
                 machine: 'apt.example.com',
                 login: 'aptlogin',
-                password: 'supersecret',
+                password: 'supersecret'
               },
-            ],
+            ]
           }
         end
 
@@ -419,12 +421,12 @@ machine apt.example.com login aptlogin password supersecret
 "
 
           it {
-            is_expected.to contain_file('/etc/apt/auth.conf').with(ensure: 'present',
-                                                                   owner: '_apt',
-                                                                   group: 'root',
-                                                                   mode: '0600',
-                                                                   notify: 'Class[Apt::Update]',
-                                                                   content: sensitive(auth_conf_content))
+            expect(subject).to contain_file('/etc/apt/auth.conf').with(ensure: 'present',
+                                                                       owner: '_apt',
+                                                                       group: 'root',
+                                                                       mode: '0600',
+                                                                       notify: 'Class[Apt::Update]',
+                                                                       content: sensitive(auth_conf_content))
           }
         end
 
@@ -434,7 +436,7 @@ machine apt.example.com login aptlogin password supersecret
           end
 
           it {
-            is_expected.not_to contain_file('/etc/apt/auth.conf')
+            expect(subject).not_to contain_file('/etc/apt/auth.conf')
           }
         end
       end
@@ -446,14 +448,14 @@ machine apt.example.com login aptlogin password supersecret
               {
                 machinn: 'deb.example.net',
                 username: 'foologin',
-                password: 'secret',
+                password: 'secret'
               },
               {
                 machine: 'apt.example.com',
                 login: 'aptlogin',
-                password: 'supersecret',
+                password: 'supersecret'
               },
-            ],
+            ]
           }
         end
 
@@ -470,13 +472,13 @@ machine apt.example.com login aptlogin password supersecret
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'bionic',
-            id: 'Ubuntu',
-          },
-        },
+            id: 'Ubuntu'
+          }
+        }
       }
     end
     let(:params) do
@@ -487,25 +489,25 @@ machine apt.example.com login aptlogin password supersecret
           'repos' => 'main contrib non-free',
           'key' => { 'id' => '150C8614919D8446E01E83AF9AA38DCD55BE302B', 'server' => 'subkeys.pgp.net' },
           'pin' => '-10',
-          'include' => { 'src' => true },
+          'include' => { 'src' => true }
         },
         'puppetlabs' => {
           'location' => 'http://apt.puppetlabs.com',
           'repos' => 'main',
-          'key' => { 'id' => '6F6B15509CF8E59E6E469F327F438280EF8D349F', 'server' => 'pgp.mit.edu' },
-        },
+          'key' => { 'id' => '6F6B15509CF8E59E6E469F327F438280EF8D349F', 'server' => 'pgp.mit.edu' }
+        }
       } }
     end
 
     it {
-      is_expected.to contain_apt__setting('list-debian_unstable').with(ensure: 'present')
+      expect(subject).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(%r{^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(%r{^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')
+      expect(subject).to contain_apt__setting('list-puppetlabs').with(ensure: 'present')
     }
 
     it { is_expected.to contain_file('/etc/apt/sources.list.d/puppetlabs.list').with_content(%r{^deb http://apt.puppetlabs.com bionic main$}) }
@@ -519,32 +521,32 @@ machine apt.example.com login aptlogin password supersecret
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'bionic',
-            id: 'Ubuntu',
-          },
-        },
+            id: 'Ubuntu'
+          }
+        }
       }
     end
     let(:params) do
       { confs: {
         'foo' => {
-          'content' => 'foo',
+          'content' => 'foo'
         },
         'bar' => {
-          'content' => 'bar',
-        },
+          'content' => 'bar'
+        }
       } }
     end
 
     it {
-      is_expected.to contain_apt__conf('foo').with(content: 'foo')
+      expect(subject).to contain_apt__conf('foo').with(content: 'foo')
     }
 
     it {
-      is_expected.to contain_apt__conf('bar').with(content: 'bar')
+      expect(subject).to contain_apt__conf('bar').with(content: 'bar')
     }
   end
 
@@ -556,32 +558,32 @@ machine apt.example.com login aptlogin password supersecret
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'bionic',
-            id: 'Ubuntu',
-          },
-        },
+            id: 'Ubuntu'
+          }
+        }
       }
     end
     let(:params) do
       { keys: {
         '55BE302B' => {
-          'server' => 'subkeys.pgp.net',
+          'server' => 'subkeys.pgp.net'
         },
         'EF8D349F' => {
-          'server' => 'pgp.mit.edu',
-        },
+          'server' => 'pgp.mit.edu'
+        }
       } }
     end
 
     it {
-      is_expected.to contain_apt__key('55BE302B').with(server: 'subkeys.pgp.net')
+      expect(subject).to contain_apt__key('55BE302B').with(server: 'subkeys.pgp.net')
     }
 
     it {
-      is_expected.to contain_apt__key('EF8D349F').with(server: 'pgp.mit.edu')
+      expect(subject).to contain_apt__key('EF8D349F').with(server: 'pgp.mit.edu')
     }
   end
 
@@ -593,19 +595,19 @@ machine apt.example.com login aptlogin password supersecret
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'bionic',
-            id: 'Ubuntu',
-          },
-        },
+            id: 'Ubuntu'
+          }
+        }
       }
     end
     let(:params) do
       { ppas: {
         'ppa:drizzle-developers/ppa' => {},
-        'ppa:nginx/stable' => {},
+        'ppa:nginx/stable' => {}
       } }
     end
 
@@ -621,19 +623,19 @@ machine apt.example.com login aptlogin password supersecret
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'bionic',
-            id: 'Ubuntu',
-          },
-        },
+            id: 'Ubuntu'
+          }
+        }
       }
     end
     let(:params) do
       { settings: {
         'conf-banana' => { 'content' => 'banana' },
-        'pref-banana' => { 'content' => 'banana' },
+        'pref-banana' => { 'content' => 'banana' }
       } }
     end
 
@@ -649,19 +651,19 @@ machine apt.example.com login aptlogin password supersecret
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'bionic',
-            id: 'Ubuntu',
-          },
-        },
+            id: 'Ubuntu'
+          }
+        }
       }
     end
     let(:params) do
       { pins: {
         'stable' => { 'priority' => 600, 'order' => 50 },
-        'testing' => { 'priority' => 700, 'order' => 100 },
+        'testing' => { 'priority' => 700, 'order' => 100 }
       } }
     end
 
@@ -674,7 +676,7 @@ machine apt.example.com login aptlogin password supersecret
       let(:params) { { purge: { 'sources.list' => 'banana' } } }
 
       it do
-        is_expected.to raise_error(Puppet::Error)
+        expect(subject).to raise_error(Puppet::Error)
       end
     end
 
@@ -682,7 +684,7 @@ machine apt.example.com login aptlogin password supersecret
       let(:params) { { purge: { 'sources.list.d' => 'banana' } } }
 
       it do
-        is_expected.to raise_error(Puppet::Error)
+        expect(subject).to raise_error(Puppet::Error)
       end
     end
 
@@ -690,7 +692,7 @@ machine apt.example.com login aptlogin password supersecret
       let(:params) { { purge: { 'preferences' => 'banana' } } }
 
       it do
-        is_expected.to raise_error(Puppet::Error)
+        expect(subject).to raise_error(Puppet::Error)
       end
     end
 
@@ -698,7 +700,7 @@ machine apt.example.com login aptlogin password supersecret
       let(:params) { { purge: { 'preferences.d' => 'banana' } } }
 
       it do
-        is_expected.to raise_error(Puppet::Error)
+        expect(subject).to raise_error(Puppet::Error)
       end
     end
 
@@ -706,7 +708,7 @@ machine apt.example.com login aptlogin password supersecret
       let(:params) { { purge: { 'apt.conf.d' => 'banana' } } }
 
       it do
-        is_expected.to raise_error(Puppet::Error)
+        expect(subject).to raise_error(Puppet::Error)
       end
     end
   end