Merge pull request #1101 from david22swan/CONT-773/main/puppet_8

[puppet-modules/puppetlabs-apt.git] / spec / defines / source_spec.rb

diff --git a/spec/defines/source_spec.rb b/spec/defines/source_spec.rb
index 641089568ed7ffc008e3e812da40d03a5811e023..e9c0cf28af2d52205c9ffdc80c10ccaff31f544b 100644 (file)
--- a/spec/defines/source_spec.rb
+++ b/spec/defines/source_spec.rb
@@ -3,16 +3,9 @@
 require 'spec_helper'
 
 describe 'apt::source' do
-  GPG_KEY_ID = '6F6B15509CF8E59E6E469F327F438280EF8D349F'
-
-  let :pre_condition do
-    'class { "apt": }'
-  end
-
-  let :title do
-    'my_source'
-  end
-
+  let(:id) { '6F6B15509CF8E59E6E469F327F438280EF8D349F' }
+  let(:title) { 'my_source' }
+  let(:pre_condition) { 'class { "apt": }' }
   let :facts do
     {
       os: {
@@ -20,28 +13,29 @@ describe 'apt::source' do
         name: 'Debian',
         release: {
           major: '9',
-          full: '9.0',
+          full: '9.0'
         },
         distro: {
           codename: 'stretch',
-          id: 'Debian',
-        },
-      },
+          id: 'Debian'
+        }
+      }
     }
   end
 
   context 'with defaults' do
     context 'without location' do
       it do
-        is_expected.to raise_error(Puppet::Error, %r{source entry without specifying a location})
+        expect(subject).to raise_error(Puppet::Error, %r{source entry without specifying a location})
       end
     end
+
     context 'with location' do
       let(:params) { { location: 'hello.there' } }
 
       it {
-        is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').without_content(%r{# my_source\ndeb-src hello.there wheezy main\n})
-        is_expected.not_to contain_package('apt-transport-https')
+        expect(subject).to contain_apt__setting('list-my_source').with(ensure: 'present').without_content(%r{# my_source\ndeb-src hello.there wheezy main\n})
+        expect(subject).not_to contain_package('apt-transport-https')
       }
     end
   end
@@ -53,21 +47,21 @@ describe 'apt::source' do
           location: 'hello.there',
           pin: { 'release' => 'wishwash',
                  'explanation' => 'wishwash',
-                 'priority'    => 1001 },
+                 'priority' => 1001 }
         }
       end
 
       it {
-        is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{hello.there stretch main\n})
+        expect(subject).to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{hello.there stretch main\n})
       }
 
       it { is_expected.to contain_file('/etc/apt/sources.list.d/my_source.list').that_notifies('Class[Apt::Update]') }
 
       it {
-        is_expected.to contain_apt__pin('my_source').that_comes_before('Apt::Setting[list-my_source]').with(ensure: 'present',
-                                                                                                            priority: 1001,
-                                                                                                            explanation: 'wishwash',
-                                                                                                            release: 'wishwash')
+        expect(subject).to contain_apt__pin('my_source').that_comes_before('Apt::Setting[list-my_source]').with(ensure: 'present',
+                                                                                                                priority: 1001,
+                                                                                                                explanation: 'wishwash',
+                                                                                                                release: 'wishwash')
       }
     end
 
@@ -78,27 +72,27 @@ describe 'apt::source' do
           location: 'http://debian.mirror.iweb.ca/debian/',
           release: 'sid',
           repos: 'testing',
-          key: GPG_KEY_ID,
+          key: id,
           pin: '10',
           architecture: 'x86_64',
-          allow_unsigned: true,
+          allow_unsigned: true
         }
       end
 
       it {
-        is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# foo\ndeb \[arch=x86_64 trusted=yes\] http://debian.mirror.iweb.ca/debian/ sid testing\n})
-                                                             .without_content(%r{deb-src})
+        expect(subject).to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# foo\ndeb \[arch=x86_64 trusted=yes\] http://debian.mirror.iweb.ca/debian/ sid testing\n})
+                                                                 .without_content(%r{deb-src})
       }
 
       it {
-        is_expected.to contain_apt__pin('my_source').that_comes_before('Apt::Setting[list-my_source]').with(ensure: 'present',
-                                                                                                            priority: '10',
-                                                                                                            origin: 'debian.mirror.iweb.ca')
+        expect(subject).to contain_apt__pin('my_source').that_comes_before('Apt::Setting[list-my_source]').with(ensure: 'present',
+                                                                                                                priority: '10',
+                                                                                                                origin: 'debian.mirror.iweb.ca')
       }
 
       it {
-        is_expected.to contain_apt__key("Add key: #{GPG_KEY_ID} from Apt::Source my_source").that_comes_before('Apt::Setting[list-my_source]').with(ensure: 'present',
-                                                                                                                                                    id: GPG_KEY_ID)
+        expect(subject).to contain_apt__key("Add key: #{id} from Apt::Source my_source").that_comes_before('Apt::Setting[list-my_source]').with(ensure: 'present',
+                                                                                                                                                id: id)
       }
     end
 
@@ -111,36 +105,36 @@ describe 'apt::source' do
           repos: 'testing',
           key: {
             'ensure' => 'refreshed',
-            'id' => GPG_KEY_ID,
+            'id' => id,
             'server' => 'pgp.mit.edu',
             'content' => 'GPG key content',
-            'source'  => 'http://apt.puppetlabs.com/pubkey.gpg',
-            'weak_ssl' => true,
+            'source' => 'http://apt.puppetlabs.com/pubkey.gpg',
+            'weak_ssl' => true
           },
           pin: '10',
           architecture: 'x86_64',
-          allow_unsigned: true,
+          allow_unsigned: true
         }
       end
 
       it {
-        is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# foo\ndeb \[arch=x86_64 trusted=yes\] http://debian.mirror.iweb.ca/debian/ sid testing\n})
-                                                             .without_content(%r{deb-src})
+        expect(subject).to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# foo\ndeb \[arch=x86_64 trusted=yes\] http://debian.mirror.iweb.ca/debian/ sid testing\n})
+                                                                 .without_content(%r{deb-src})
       }
 
       it {
-        is_expected.to contain_apt__pin('my_source').that_comes_before('Apt::Setting[list-my_source]').with(ensure: 'present',
-                                                                                                            priority: '10',
-                                                                                                            origin: 'debian.mirror.iweb.ca')
+        expect(subject).to contain_apt__pin('my_source').that_comes_before('Apt::Setting[list-my_source]').with(ensure: 'present',
+                                                                                                                priority: '10',
+                                                                                                                origin: 'debian.mirror.iweb.ca')
       }
 
       it {
-        is_expected.to contain_apt__key("Add key: #{GPG_KEY_ID} from Apt::Source my_source").that_comes_before('Apt::Setting[list-my_source]').with(ensure: 'refreshed',
-                                                                                                                                                    id: GPG_KEY_ID,
-                                                                                                                                                    server: 'pgp.mit.edu',
-                                                                                                                                                    content: 'GPG key content',
-                                                                                                                                                    source: 'http://apt.puppetlabs.com/pubkey.gpg',
-                                                                                                                                                    weak_ssl: true)
+        expect(subject).to contain_apt__key("Add key: #{id} from Apt::Source my_source").that_comes_before('Apt::Setting[list-my_source]').with(ensure: 'refreshed',
+                                                                                                                                                id: GPG_KEY_ID,
+                                                                                                                                                server: 'pgp.mit.edu',
+                                                                                                                                                content: 'GPG key content',
+                                                                                                                                                source: 'http://apt.puppetlabs.com/pubkey.gpg',
+                                                                                                                                                weak_ssl: true)
       }
     end
   end
@@ -149,12 +143,12 @@ describe 'apt::source' do
     let :params do
       {
         location: 'hello.there',
-        allow_insecure: true,
+        allow_insecure: true
       }
     end
 
     it {
-      is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb \[allow-insecure=yes\] hello.there stretch main\n})
+      expect(subject).to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb \[allow-insecure=yes\] hello.there stretch main\n})
     }
   end
 
@@ -162,12 +156,12 @@ describe 'apt::source' do
     let :params do
       {
         location: 'hello.there',
-        allow_unsigned: true,
+        allow_unsigned: true
       }
     end
 
     it {
-      is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb \[trusted=yes\] hello.there stretch main\n})
+      expect(subject).to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb \[trusted=yes\] hello.there stretch main\n})
     }
   end
 
@@ -175,12 +169,12 @@ describe 'apt::source' do
     let :params do
       {
         location: 'hello.there',
-        check_valid_until: false,
+        check_valid_until: false
       }
     end
 
     it {
-      is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb \[check-valid-until=false\] hello.there stretch main\n})
+      expect(subject).to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb \[check-valid-until=false\] hello.there stretch main\n})
     }
   end
 
@@ -188,12 +182,12 @@ describe 'apt::source' do
     let :params do
       {
         location: 'hello.there',
-        check_valid_until: true,
+        check_valid_until: true
       }
     end
 
     it {
-      is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb hello.there stretch main\n})
+      expect(subject).to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb hello.there stretch main\n})
     }
   end
 
@@ -201,12 +195,12 @@ describe 'apt::source' do
     let :params do
       {
         location: 'hello.there',
-        keyring: '/usr/share/keyrings/foo-archive-keyring.gpg',
+        keyring: '/usr/share/keyrings/foo-archive-keyring.gpg'
       }
     end
 
     it {
-      is_expected.to contain_apt__setting('list-my_source')
+      expect(subject).to contain_apt__setting('list-my_source')
         .with(ensure: 'present')
         .with_content(%r{# my_source\ndeb \[signed-by=/usr/share/keyrings/foo-archive-keyring.gpg\] hello.there stretch main\n})
     }
@@ -218,12 +212,12 @@ describe 'apt::source' do
         location: 'hello.there',
         architecture: 'amd64',
         allow_unsigned: true,
-        keyring: '/usr/share/keyrings/foo-archive-keyring.gpg',
+        keyring: '/usr/share/keyrings/foo-archive-keyring.gpg'
       }
     end
 
     it {
-      is_expected.to contain_apt__setting('list-my_source')
+      expect(subject).to contain_apt__setting('list-my_source')
         .with(ensure: 'present')
         .with_content(%r{# my_source\ndeb \[arch=amd64 trusted=yes signed-by=/usr/share/keyrings/foo-archive-keyring.gpg\] hello.there stretch main\n})
     }
@@ -233,12 +227,12 @@ describe 'apt::source' do
     let :params do
       {
         location: 'HTTPS://foo.bar',
-        allow_unsigned: false,
+        allow_unsigned: false
       }
     end
 
     it {
-      is_expected.to contain_package('apt-transport-https')
+      expect(subject).to contain_package('apt-transport-https')
     }
   end
 
@@ -250,26 +244,26 @@ describe 'apt::source' do
           name: 'Debian',
           release: {
             major: '9',
-            full: '9.0',
+            full: '9.0'
           },
           distro: {
             codename: 'stretch',
-            id: 'Debian',
-          },
+            id: 'Debian'
+          }
         },
-        puppetversion: Puppet.version,
+        puppetversion: Puppet.version
       }
     end
     let :params do
       {
         location: 'HTTPS://foo.bar',
         allow_unsigned: false,
-        release: 'customrelease',
+        release: 'customrelease'
       }
     end
 
     it {
-      is_expected.to contain_package('apt-transport-https')
+      expect(subject).to contain_package('apt-transport-https')
     }
   end
 
@@ -281,24 +275,24 @@ describe 'apt::source' do
           name: 'Debian',
           release: {
             major: '10',
-            full: '10.0',
+            full: '10.0'
           },
           distro: {
             codename: 'buster',
-            id: 'Debian',
-          },
-        },
+            id: 'Debian'
+          }
+        }
       }
     end
     let :params do
       {
         location: 'https://foo.bar',
-        allow_unsigned: false,
+        allow_unsigned: false
       }
     end
 
     it {
-      is_expected.not_to contain_package('apt-transport-https')
+      expect(subject).not_to contain_package('apt-transport-https')
     }
   end
 
@@ -310,25 +304,25 @@ describe 'apt::source' do
           name: 'Debian',
           release: {
             major: '7',
-            full: '7.0',
+            full: '7.0'
           },
           distro: {
             codename: 'wheezy',
-            id: 'Debian',
-          },
-        },
+            id: 'Debian'
+          }
+        }
       }
     end
     let :params do
       {
         location: 'hello.there',
         include: { 'deb' => false, 'src' => true },
-        architecture: 'x86_64',
+        architecture: 'x86_64'
       }
     end
 
     it {
-      is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb-src \[arch=x86_64\] hello.there wheezy main\n})
+      expect(subject).to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb-src \[arch=x86_64\] hello.there wheezy main\n})
     }
   end
 
@@ -339,12 +333,12 @@ describe 'apt::source' do
     let :params do
       {
         location: 'hello.there',
-        include: { 'deb' => false, 'src' => true },
+        include: { 'deb' => false, 'src' => true }
       }
     end
 
     it {
-      is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb-src hello.there stretch main\n})
+      expect(subject).to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb-src hello.there stretch main\n})
     }
   end
 
@@ -352,12 +346,12 @@ describe 'apt::source' do
     let :params do
       {
         location: 'hello.there',
-        include: { 'src' => true },
+        include: { 'src' => true }
       }
     end
 
     it {
-      is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb hello.there stretch main\ndeb-src hello.there stretch main\n})
+      expect(subject).to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb hello.there stretch main\ndeb-src hello.there stretch main\n})
     }
   end
 
@@ -365,13 +359,14 @@ describe 'apt::source' do
     let :params do
       {
         include: { 'deb' => false },
-        location: 'hello.there',
+        location: 'hello.there'
       }
     end
 
     it {
-      is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').without_content(%r{deb-src hello.there wheezy main\n})
+      expect(subject).to contain_apt__setting('list-my_source').with(ensure: 'present').without_content(%r{deb-src hello.there wheezy main\n})
     }
+
     it { is_expected.to contain_apt__setting('list-my_source').without_content(%r{deb hello.there wheezy main\n}) }
   end
 
@@ -379,25 +374,26 @@ describe 'apt::source' do
     let :params do
       {
         include: { 'deb' => false, 'src' => true },
-        location: 'hello.there',
+        location: 'hello.there'
       }
     end
 
     it {
-      is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{deb-src hello.there stretch main\n})
+      expect(subject).to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{deb-src hello.there stretch main\n})
     }
+
     it { is_expected.to contain_apt__setting('list-my_source').without_content(%r{deb hello.there stretch main\n}) }
   end
 
   context 'with ensure => absent' do
     let :params do
       {
-        ensure: 'absent',
+        ensure: 'absent'
       }
     end
 
     it {
-      is_expected.to contain_apt__setting('list-my_source').with(ensure: 'absent')
+      expect(subject).to contain_apt__setting('list-my_source').with(ensure: 'absent')
     }
   end
 
@@ -410,18 +406,18 @@ describe 'apt::source' do
             name: 'Debian',
             release: {
               major: '8',
-              full: '8.0',
+              full: '8.0'
             },
             distro: {
-              id: 'Debian',
-            },
-          },
+              id: 'Debian'
+            }
+          }
         }
       end
       let(:params) { { location: 'hello.there' } }
 
       it do
-        is_expected.to raise_error(Puppet::Error, %r{os.distro.codename fact not available: release parameter required})
+        expect(subject).to raise_error(Puppet::Error, %r{os.distro.codename fact not available: release parameter required})
       end
     end
 
@@ -435,19 +431,19 @@ describe 'apt::source' do
       let :params do
         {
           location: 'hello.there',
-          pin: true,
+          pin: true
         }
       end
 
       it do
-        is_expected.to raise_error(Puppet::Error, %r{expects a value})
+        expect(subject).to raise_error(Puppet::Error, %r{expects a value})
       end
     end
 
     context 'with notify_update = undef (default)' do
       let :params do
         {
-          location: 'hello.there',
+          location: 'hello.there'
         }
       end
 
@@ -458,7 +454,7 @@ describe 'apt::source' do
       let :params do
         {
           location: 'hello.there',
-          notify_update: true,
+          notify_update: true
         }
       end
 
@@ -469,7 +465,7 @@ describe 'apt::source' do
       let :params do
         {
           location: 'hello.there',
-          notify_update: false,
+          notify_update: false
         }
       end