Merge pull request #442 from mhaskel/add_base_name

[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 a597cb86632e41b4890c1f2e168bf2f79e491046..7b7c54efc452c4744072c901bbdbb722260532ac 100644 (file)
--- a/spec/defines/setting_spec.rb
+++ b/spec/defines/setting_spec.rb
@@ -10,36 +10,36 @@ describe 'apt::setting' do
   describe 'when using the defaults' do
     context 'without setting_type' do
       it do
-        expect { should compile }.to raise_error(Puppet::Error, /Must pass setting_type /)
+        expect { is_expected.to compile }.to raise_error(Puppet::Error, /Must pass setting_type /)
       end
     end
 
     context 'without source or content' do
       let(:params) { { :setting_type => 'conf' } }
       it do
-        expect { should compile }.to raise_error(Puppet::Error, /needs either of /)
+        expect { is_expected.to compile }.to raise_error(Puppet::Error, /needs either of /)
       end
     end
 
     context 'with setting_type=conf' do
       let(:params) { default_params }
-      it { should contain_file('/etc/apt/apt.conf.d/50teddybear') }
+      it { is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear') }
     end
 
     context 'with setting_type=pref' do
       let(:params) { { :setting_type => 'pref', :content => 'di' } }
-      it { should contain_file('/etc/apt/preferences.d/50teddybear') }
+      it { is_expected.to contain_file('/etc/apt/preferences.d/50teddybear') }
     end
 
     context 'with setting_type=list' do
       let(:params) { { :setting_type => 'list', :content => 'di' } }
-      it { should contain_file('/etc/apt/sources.list.d/teddybear.list') }
+      it { is_expected.to contain_file('/etc/apt/sources.list.d/teddybear.list') }
     end
 
     context 'with source' do
       let(:params) { { :setting_type => 'conf', :source => 'puppet:///la/die/dah' } }
       it {
-        should contain_file('/etc/apt/apt.conf.d/50teddybear').with({
+        is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear').with({
         :ensure => 'file',
         :owner  => 'root',
         :group  => 'root',
@@ -50,7 +50,7 @@ describe 'apt::setting' do
 
     context 'with content' do
       let(:params) { default_params }
-      it { should contain_file('/etc/apt/apt.conf.d/50teddybear').with({
+      it { is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear').with({
         :ensure  => 'file',
         :owner   => 'root',
         :group   => 'root',
@@ -64,35 +64,35 @@ describe 'apt::setting' do
     context 'with source and content' do
       let(:params) { default_params.merge({ :source => 'la' }) }
       it do
-        expect { should compile }.to raise_error(Puppet::Error, /cannot have both /)
+        expect { is_expected.to compile }.to raise_error(Puppet::Error, /cannot have both /)
       end
     end
 
     context 'with setting_type=ext' do
       let(:params) { default_params.merge({ :setting_type => 'ext' }) }
       it do
-        expect { should compile }.to raise_error(Puppet::Error, /"ext" does not /)
+        expect { is_expected.to compile }.to raise_error(Puppet::Error, /"ext" does not /)
       end
     end
 
     context 'with ensure=banana' do
       let(:params) { default_params.merge({ :ensure => 'banana' }) }
       it do
-        expect { should compile }.to raise_error(Puppet::Error, /"banana" does not /)
+        expect { is_expected.to compile }.to raise_error(Puppet::Error, /"banana" does not /)
       end
     end
 
     context 'with priority=1.2' do
       let(:params) { default_params.merge({ :priority => 1.2 }) }
       it do
-        expect { should compile }.to raise_error(Puppet::Error, /be an integer /)
+        expect { is_expected.to compile }.to raise_error(Puppet::Error, /be an integer /)
       end
     end
   end
 
   describe 'with priority=100' do
     let(:params) { default_params.merge({ :priority => 100 }) }
-    it { should contain_file('/etc/apt/apt.conf.d/100teddybear') }
+    it { is_expected.to contain_file('/etc/apt/apt.conf.d/100teddybear') }
   end
 
   describe 'with base_name=puppy' do
@@ -109,7 +109,7 @@ describe 'apt::setting' do
 
   describe 'with ensure=absent' do
     let(:params) { default_params.merge({ :ensure => 'absent' }) }
-    it { should contain_file('/etc/apt/apt.conf.d/50teddybear').with({
+    it { is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear').with({
       :ensure => 'absent',
     })}
   end
@@ -117,7 +117,7 @@ describe 'apt::setting' do
   describe 'with file_perms' do
     context "{'owner' => 'roosevelt'}" do
       let(:params) { default_params.merge({ :file_perms => {'owner' => 'roosevelt'} }) }
-      it { should contain_file('/etc/apt/apt.conf.d/50teddybear').with({
+      it { is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear').with({
         :owner => 'roosevelt',
         :group => 'root',
         :mode  => '0644',
@@ -126,7 +126,7 @@ describe 'apt::setting' do
 
     context "'group' => 'roosevelt'}" do
       let(:params) { default_params.merge({ :file_perms => {'group' => 'roosevelt'} }) }
-      it { should contain_file('/etc/apt/apt.conf.d/50teddybear').with({
+      it { is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear').with({
         :owner => 'root',
         :group => 'roosevelt',
         :mode  => '0644',
@@ -135,7 +135,7 @@ describe 'apt::setting' do
 
     context "'owner' => 'roosevelt'}" do
       let(:params) { default_params.merge({ :file_perms => {'mode' => '0600'} }) }
-      it { should contain_file('/etc/apt/apt.conf.d/50teddybear').with({
+      it { is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear').with({
         :owner => 'root',
         :group => 'root',
         :mode  => '0600',