Merge pull request #931 from puppetlabs/pdksync_dependency_gems_update

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

diff --git a/spec/defines/setting_spec.rb b/spec/defines/setting_spec.rb
index 0b6ca99b60eadb5f706c4da31f6d51b257f4d2f8..16db75145ab8acc97b1a7c367e326974c4022322 100644 (file)
--- 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: '7', full: '7.0' } },
-      lsbdistrelease: '7.0',
-      lsbdistcodename: 'wheezy',
+      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' }
@@ -20,7 +19,7 @@ describe 'apt::setting' do
   describe 'when using the defaults' do
     context 'without source or content' do
       it do
-        expect { subject.call }.to raise_error(Puppet::Error, %r{needs either of })
+        is_expected.to raise_error(Puppet::Error, %r{needs either of })
       end
     end
 
@@ -51,7 +50,6 @@ describe 'apt::setting' do
         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)
       }
     end
@@ -63,7 +61,6 @@ describe 'apt::setting' do
         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)
       }
     end
@@ -77,11 +74,10 @@ describe 'apt::setting' do
     end
     let(:facts) do
       {
-        os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
+        os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
         lsbdistid: 'Debian',
         osfamily: 'Debian',
-        lsbdistcodename: 'wheezy',
-        puppetversion: Puppet.version,
+        lsbdistcodename: 'jessie',
       }
     end
     let(:title) { 'conf-teddybear' }
@@ -97,7 +93,7 @@ describe 'apt::setting' do
       let(:params) { default_params.merge(source: 'la') }
 
       it do
-        expect { subject.call }.to raise_error(Puppet::Error, %r{cannot have both })
+        is_expected.to raise_error(Puppet::Error, %r{cannot have both })
       end
     end
 
@@ -106,7 +102,7 @@ describe 'apt::setting' do
       let(:params) { default_params }
 
       it do
-        expect { subject.call }.to raise_error(Puppet::Error, %r{must start with either})
+        is_expected.to raise_error(Puppet::Error, %r{must start with either})
       end
     end
 
@@ -114,18 +110,14 @@ describe 'apt::setting' do
       let(:params) { default_params.merge(ensure: 'banana') }
 
       it do
-        expect { subject.call }.to raise_error(Puppet::Error, %r{Enum\['absent', 'file', 'present'\]})
+        is_expected.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