Fix rubocop checks (rodjek#53)

Author: coreone

spec/classes/defaults_spec.rb

@@ -10,21 +10,21 @@
         case facts[:operatingsystem]
         when 'Debian'
           it do
-            should contain_logrotate__rule('wtmp').with('rotate_every' => 'month',
-                                                        'rotate'       => '1',
-                                                        'create'       => true,
-                                                        'create_mode'  => '0664',
-                                                        'create_owner' => 'root',
-                                                        'create_group' => 'utmp',
-                                                        'missingok'    => true)
+            is_expected.to contain_logrotate__rule('wtmp').with('rotate_every' => 'month',
+                                                                'rotate'       => '1',
+                                                                'create'       => true,
+                                                                'create_mode'  => '0664',
+                                                                'create_owner' => 'root',
+                                                                'create_group' => 'utmp',
+                                                                'missingok'    => true)
 
-            should contain_logrotate__rule('btmp').with('rotate_every' => 'month',
-                                                        'rotate'       => '1',
-                                                        'create'       => true,
-                                                        'create_mode'  => '0600',
-                                                        'create_owner' => 'root',
-                                                        'create_group' => 'utmp',
-                                                        'missingok'    => true)
+            is_expected.to contain_logrotate__rule('btmp').with('rotate_every' => 'month',
+                                                                'rotate'       => '1',
+                                                                'create'       => true,
+                                                                'create_mode'  => '0600',
+                                                                'create_owner' => 'root',
+                                                                'create_group' => 'utmp',
+                                                                'missingok'    => true)
           end
         end
       end

spec/classes/hourly_spec.rb

@@ -3,38 +3,38 @@
 describe 'logrotate::hourly' do
   context 'with default values' do
     it do
-      should contain_file('/etc/logrotate.d/hourly').with('ensure' => 'directory',
-                                                          'owner'  => 'root',
-                                                          'group'  => 'root',
-                                                          'mode'   => '0755')
+      is_expected.to contain_file('/etc/logrotate.d/hourly').with('ensure' => 'directory',
+                                                                  'owner'  => 'root',
+                                                                  'group'  => 'root',
+                                                                  'mode'   => '0755')
     end
 
     it do
-      should contain_file('/etc/cron.hourly/logrotate').with('ensure' => 'present',
-                                                             'owner'   => 'root',
-                                                             'group'   => 'root',
-                                                             'mode'    => '0555',
-                                                             'source'  => 'puppet:///modules/logrotate/etc/cron.hourly/logrotate',
-                                                             'require' => [
-                                                               'File[/etc/logrotate.d/hourly]',
-                                                               'Package[logrotate]'
-                                                             ])
+      is_expected.to contain_file('/etc/cron.hourly/logrotate').with('ensure' => 'present',
+                                                                     'owner'   => 'root',
+                                                                     'group'   => 'root',
+                                                                     'mode'    => '0555',
+                                                                     'source'  => 'puppet:///modules/logrotate/etc/cron.hourly/logrotate',
+                                                                     'require' => [
+                                                                       'File[/etc/logrotate.d/hourly]',
+                                                                       'Package[logrotate]'
+                                                                     ])
     end
   end
 
   context 'with ensure => absent' do
     let(:params) { { ensure: 'absent' } }
 
-    it { should contain_file('/etc/logrotate.d/hourly').with_ensure('absent') }
-    it { should contain_file('/etc/cron.hourly/logrotate').with_ensure('absent') }
+    it { is_expected.to contain_file('/etc/logrotate.d/hourly').with_ensure('absent') }
+    it { is_expected.to contain_file('/etc/cron.hourly/logrotate').with_ensure('absent') }
   end
 
   context 'with ensure => foo' do
     let(:params) { { ensure: 'foo' } }
 
     it do
       expect do
-        should contain_file('/etc/logrotate.d/hourly')
+        is_expected.to contain_file('/etc/logrotate.d/hourly')
       end.to raise_error(Puppet::Error, %r{Invalid ensure value 'foo'})
     end
   end

spec/classes/init_spec.rb

@@ -14,7 +14,7 @@
           it { is_expected.to compile.with_all_deps }
 
           it do
-            should contain_package('logrotate').with_ensure('present')
+            is_expected.to contain_package('logrotate').with_ensure('present')
 
             #    should contain_file('/etc/logrotate.conf').with({
             #      'ensure'  => 'file',
@@ -26,18 +26,18 @@
             #      'require' => 'Package[logrotate]',
             #    })
 
-            should contain_file('/etc/logrotate.d').with('ensure' => 'directory',
-                                                         'owner'   => 'root',
-                                                         'group'   => 'root',
-                                                         'mode'    => '0755')
+            is_expected.to contain_file('/etc/logrotate.d').with('ensure' => 'directory',
+                                                                 'owner'   => 'root',
+                                                                 'group'   => 'root',
+                                                                 'mode'    => '0755')
 
-            should contain_file('/etc/cron.daily/logrotate').with('ensure' => 'file',
-                                                                  'owner'   => 'root',
-                                                                  'group'   => 'root',
-                                                                  'mode'    => '0555',
-                                                                  'source'  => 'puppet:///modules/logrotate/etc/cron.daily/logrotate')
+            is_expected.to contain_file('/etc/cron.daily/logrotate').with('ensure' => 'file',
+                                                                          'owner'   => 'root',
+                                                                          'group'   => 'root',
+                                                                          'mode'    => '0555',
+                                                                          'source'  => 'puppet:///modules/logrotate/etc/cron.daily/logrotate')
 
-            should contain_class('logrotate::defaults')
+            is_expected.to contain_class('logrotate::defaults')
           end
         end
       end