X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fdefines%2Fsetting_spec.rb;h=7e2a9087aa9d1528462402a51fc37722793c0027;hb=316fd8f4dd1eb6595b3be495ccc5f4924da4de1b;hp=2d7041459b075182f8ab7b577833f7fff452bf54;hpb=3423414fec223617fafb0806c8147a96ebedc80e;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/defines/setting_spec.rb b/spec/defines/setting_spec.rb
index 2d70414..7e2a908 100644
--- a/spec/defines/setting_spec.rb
+++ b/spec/defines/setting_spec.rb
@@ -4,13 +4,12 @@ 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' } },
+      os: { distro: { codename: 'jessie' }, family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
       lsbdistrelease: '8.0',
       lsbdistcodename: 'jessie',
       operatingsystem: 'Debian',
       osfamily: 'Debian',
       lsbdistid: 'Debian',
-      puppetversion: Puppet.version,
     }
   end
   let(:title) { 'conf-teddybear' }
@@ -81,7 +80,6 @@ describe 'apt::setting' do
         lsbdistid: 'Debian',
         osfamily: 'Debian',
         lsbdistcodename: 'jessie',
-        puppetversion: Puppet.version,
       }
     end
     let(:title) { 'conf-teddybear' }
@@ -121,11 +119,7 @@ describe 'apt::setting' do
     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