X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=spec%2Fdefines%2Fsource_compat_spec.rb;h=dc261fbb88210fd2f0fd447e2f91d183bbf4def9;hb=4513a5845c2a18aece7e17ad82612ec4da3efaa0;hp=d7dfb7869564b5a49c7f54e07c754cc14f91cf46;hpb=0e0005cedd13e44882ef569ec668546cb8620b28;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/defines/source_compat_spec.rb b/spec/defines/source_compat_spec.rb
index d7dfb78..dc261fb 100644
--- a/spec/defines/source_compat_spec.rb
+++ b/spec/defines/source_compat_spec.rb
@@ -35,47 +35,47 @@ describe 'apt::source', type: :define do
     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',
+        '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,
       }
     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: #{GPG_KEY_ID} from Apt::Source my_source").that_comes_before('Apt::Setting[list-my_source]').with('ensure' => 'present',
+                                                                                                                                                      'id' => GPG_KEY_ID)
     }
   end
 
   context 'when allow_insecure true' do
     let :params do
       {
-        'include'        => { 'src' => false },
-        'location'       => 'http://debian.mirror.iweb.ca/debian/',
+        'include' => { 'src' => false },
+        'location' => 'http://debian.mirror.iweb.ca/debian/',
         'allow_insecure' => true,
       }
     end
@@ -86,8 +86,8 @@ 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/',
+        'include' => { 'src' => false },
+        'location' => 'http://debian.mirror.iweb.ca/debian/',
         'allow_unsigned' => true,
       }
     end
@@ -98,13 +98,13 @@ describe 'apt::source', type: :define do
   context 'with architecture equals x86_64' do
     let :params do
       {
-        'location'     => 'http://debian.mirror.iweb.ca/debian/',
+        '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
 
@@ -116,7 +116,7 @@ describe 'apt::source', type: :define do
     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
 
@@ -139,7 +139,7 @@ describe 'apt::source', type: :define do
       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