X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fdefines%2Fsetting_spec.rb;h=7a7189605395e82bdd25d7167b709890d577f7d2;hb=refs%2Fheads%2Frelease-prep;hp=2d7041459b075182f8ab7b577833f7fff452bf54;hpb=16c73c8ab4786a485cce0faaf2085100b77ec870;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/defines/setting_spec.rb b/spec/defines/setting_spec.rb
index 2d70414..7a71896 100644
--- a/spec/defines/setting_spec.rb
+++ b/spec/defines/setting_spec.rb
@@ -1,16 +1,23 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apt::setting' do
   let(:pre_condition) { 'class { "apt": }' }
   let :facts do
     {
-      os: { distro: { codename: 'wheezy' }, family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-      lsbdistrelease: '8.0',
-      lsbdistcodename: 'jessie',
-      operatingsystem: 'Debian',
-      osfamily: 'Debian',
-      lsbdistid: 'Debian',
-      puppetversion: Puppet.version,
+      os: {
+        family: 'Debian',
+        name: 'Debian',
+        release: {
+          major: '9',
+          full: '9.0'
+        },
+        distro: {
+          codename: 'stretch',
+          id: 'Debian'
+        }
+      }
     }
   end
   let(:title) { 'conf-teddybear' }
@@ -20,11 +27,11 @@ describe 'apt::setting' do
   describe 'when using the defaults' do
     context 'without source or content' do
       it do
-        is_expected.to raise_error(Puppet::Error, %r{needs either of })
+        expect(subject).to raise_error(Puppet::Error, %r{needs either of })
       end
     end
 
-    context 'with title=conf-teddybear ' do
+    context 'with title=conf-teddybear' do
       let(:params) { default_params }
 
       it { is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Class[Apt::Update]') }
@@ -48,11 +55,10 @@ describe 'apt::setting' do
       let(:params) { { source: 'puppet:///la/die/dah' } }
 
       it {
-        is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Class[Apt::Update]').with(ensure: 'file',
-                                                                                                                owner: 'root',
-                                                                                                                group: 'root',
-                                                                                                                mode: '0644',
-                                                                                                                source: params[:source].to_s)
+        expect(subject).to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Class[Apt::Update]').with(ensure: 'file',
+                                                                                                                    owner: 'root',
+                                                                                                                    group: 'root',
+                                                                                                                    source: params[:source].to_s)
       }
     end
 
@@ -60,11 +66,10 @@ describe 'apt::setting' do
       let(:params) { default_params }
 
       it {
-        is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Class[Apt::Update]').with(ensure: 'file',
-                                                                                                                owner: 'root',
-                                                                                                                group: 'root',
-                                                                                                                mode: '0644',
-                                                                                                                content: params[:content].to_s)
+        expect(subject).to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Class[Apt::Update]').with(ensure: 'file',
+                                                                                                                    owner: 'root',
+                                                                                                                    group: 'root',
+                                                                                                                    content: params[:content].to_s)
       }
     end
   end
@@ -77,11 +82,18 @@ describe 'apt::setting' do
     end
     let(:facts) do
       {
-        os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
-        lsbdistid: 'Debian',
-        osfamily: 'Debian',
-        lsbdistcodename: 'jessie',
-        puppetversion: Puppet.version,
+        os: {
+          family: 'Debian',
+          name: 'Debian',
+          release: {
+            major: '9',
+            full: '9.0'
+          },
+          distro: {
+            codename: 'stretch',
+            id: 'Debian'
+          }
+        }
       }
     end
     let(:title) { 'conf-teddybear' }
@@ -97,7 +109,7 @@ describe 'apt::setting' do
       let(:params) { default_params.merge(source: 'la') }
 
       it do
-        is_expected.to raise_error(Puppet::Error, %r{cannot have both })
+        expect(subject).to raise_error(Puppet::Error, %r{cannot have both })
       end
     end
 
@@ -106,7 +118,7 @@ describe 'apt::setting' do
       let(:params) { default_params }
 
       it do
-        is_expected.to raise_error(Puppet::Error, %r{must start with either})
+        expect(subject).to raise_error(Puppet::Error, %r{must start with either})
       end
     end
 
@@ -114,18 +126,14 @@ describe 'apt::setting' do
       let(:params) { default_params.merge(ensure: 'banana') }
 
       it do
-        is_expected.to raise_error(Puppet::Error, %r{Enum\['absent', 'file', 'present'\]})
+        expect(subject).to raise_error(Puppet::Error, %r{Enum\['absent', 'file', 'present'\]})
       end
     end
 
     context 'with priority=1.2' do
       let(:params) { default_params.merge(priority: 1.2) }
 
-      if Puppet::Util::Package.versioncmp(Puppet.version, '4.0') >= 0 || ENV['FUTURE_PARSER'] == 'yes'
-        it { is_expected.to compile.and_raise_error(%r{expects a value of type}) }
-      else
-        it { is_expected.to compile.and_raise_error(%r{priority must be an integer or a zero-padded integer}) }
-      end
+      it { is_expected.to compile.and_raise_error(%r{expects a value of type}) }
     end
   end
 
@@ -139,7 +147,7 @@ describe 'apt::setting' do
     let(:params) { default_params.merge(ensure: 'absent') }
 
     it {
-      is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Class[Apt::Update]').with(ensure: 'absent')
+      expect(subject).to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Class[Apt::Update]').with(ensure: 'absent')
     }
   end
 end