X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fdefines%2Fsource_compat_spec.rb;h=55be585aa63918a02ceb5c7f649bbd5a8c8e3cc8;hb=refs%2Fheads%2Frelease-prep;hp=d7dfb7869564b5a49c7f54e07c754cc14f91cf46;hpb=1192618d075d30a8131f8cfff6af79f42c85d6a3;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/defines/source_compat_spec.rb b/spec/defines/source_compat_spec.rb
index d7dfb78..55be585 100644
--- a/spec/defines/source_compat_spec.rb
+++ b/spec/defines/source_compat_spec.rb
@@ -3,12 +3,8 @@
 require 'spec_helper'
 
 describe 'apt::source', type: :define do
-  GPG_KEY_ID = '6F6B15509CF8E59E6E469F327F438280EF8D349F'
-
-  let :title do
-    'my_source'
-  end
-
+  let(:id) { '6F6B15509CF8E59E6E469F327F438280EF8D349F' }
+  let(:title) { 'my_source' }
   let :facts do
     {
       os: {
@@ -16,13 +12,13 @@ describe 'apt::source', type: :define do
         name: 'Debian',
         release: {
           major: '9',
-          full: '9.0',
+          full: '9.0'
         },
         distro: {
           codename: 'stretch',
-          id: 'Debian',
-        },
-      },
+          id: 'Debian'
+        }
+      }
     }
   end
 
@@ -30,53 +26,53 @@ describe 'apt::source', type: :define do
     let :params do
       {
         'include' => { 'deb' => false, 'src' => true },
-        'location' => 'http://debian.mirror.iweb.ca/debian/',
+        'location' => 'http://debian.mirror.iweb.ca/debian/'
       }
     end
 
     it {
-      is_expected.to contain_apt__setting('list-my_source').with_content(%r{# my_source\ndeb-src http://debian.mirror.iweb.ca/debian/ stretch main\n})
+      expect(subject).to contain_apt__setting('list-my_source').with_content(%r{# my_source\ndeb-src http://debian.mirror.iweb.ca/debian/ stretch main\n})
     }
   end
 
   context 'with no defaults' do
     let :params do
       {
-        'comment'        => 'foo',
-        'location'       => 'http://debian.mirror.iweb.ca/debian/',
-        'release'        => 'sid',
-        'repos'          => 'testing',
-        'include'        => { 'src' => false },
-        'key'            => GPG_KEY_ID,
-        'pin'            => '10',
-        'architecture'   => 'x86_64',
-        'allow_unsigned' => true,
+        'comment' => 'foo',
+        'location' => 'http://debian.mirror.iweb.ca/debian/',
+        'release' => 'sid',
+        'repos' => 'testing',
+        'include' => { 'src' => false },
+        'key' => id,
+        'pin' => '10',
+        'architecture' => 'x86_64',
+        'allow_unsigned' => true
       }
     end
 
     it {
-      is_expected.to contain_apt__setting('list-my_source').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_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
 
   context 'when allow_insecure true' do
     let :params do
       {
-        'include'        => { 'src' => false },
-        'location'       => 'http://debian.mirror.iweb.ca/debian/',
-        'allow_insecure' => true,
+        'include' => { 'src' => false },
+        'location' => 'http://debian.mirror.iweb.ca/debian/',
+        'allow_insecure' => true
       }
     end
 
@@ -86,9 +82,9 @@ describe 'apt::source', type: :define do
   context 'when allow_unsigned true' do
     let :params do
       {
-        'include'        => { 'src' => false },
-        'location'       => 'http://debian.mirror.iweb.ca/debian/',
-        'allow_unsigned' => true,
+        'include' => { 'src' => false },
+        'location' => 'http://debian.mirror.iweb.ca/debian/',
+        'allow_unsigned' => true
       }
     end
 
@@ -98,25 +94,25 @@ describe 'apt::source', type: :define do
   context 'with architecture equals x86_64' do
     let :params do
       {
-        'location'     => 'http://debian.mirror.iweb.ca/debian/',
-        'architecture' => 'x86_64',
+        'location' => 'http://debian.mirror.iweb.ca/debian/',
+        'architecture' => 'x86_64'
       }
     end
 
     it {
-      is_expected.to contain_apt__setting('list-my_source').with_content(%r{# my_source\ndeb \[arch=x86_64\] http://debian.mirror.iweb.ca/debian/ stretch main\n})
+      expect(subject).to contain_apt__setting('list-my_source').with_content(%r{# my_source\ndeb \[arch=x86_64\] http://debian.mirror.iweb.ca/debian/ 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
 
@@ -129,17 +125,17 @@ describe 'apt::source', type: :define do
             name: 'Debian',
             release: {
               major: '8',
-              full: '8.0',
+              full: '8.0'
             },
             distro: {
-              id: 'Debian',
-            },
-          },
+              id: 'Debian'
+            }
+          }
         }
       end
 
       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
   end