X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fdefines%2Fconf_spec.rb;h=26638e338a505d5ff15bd83cb77b4d569348f077;hb=refs%2Fheads%2Frelease-prep;hp=1296e999f89c283ce602a3b5bde5f51a99772cd9;hpb=f610bedc5f33db5fdee2ad49eeda95268ab0b9a5;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/defines/conf_spec.rb b/spec/defines/conf_spec.rb
index 1296e99..26638e3 100644
--- a/spec/defines/conf_spec.rb
+++ b/spec/defines/conf_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 describe 'apt::conf', type: :define do
   let :pre_condition do
@@ -5,11 +7,18 @@ describe 'apt::conf', type: :define do
   end
   let(:facts) do
     {
-      os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
-      lsbdistid: 'Debian',
-      osfamily: 'Debian',
-      lsbdistcodename: 'wheezy',
-      puppetversion: Puppet.version,
+      os: {
+        family: 'Debian',
+        name: 'Debian',
+        release: {
+          major: '9',
+          full: '9.0'
+        },
+        distro: {
+          codename: 'stretch',
+          id: 'Debian'
+        }
+      }
     }
   end
   let :title do
@@ -20,7 +29,7 @@ describe 'apt::conf', type: :define do
     let :default_params do
       {
         priority: '00',
-        content: "Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n",
+        content: "Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n"
       }
     end
     let :params do
@@ -32,11 +41,10 @@ describe 'apt::conf', type: :define do
     end
 
     it {
-      is_expected.to contain_file(filename).with('ensure' => 'present',
-                                                 'content'   => %r{Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;},
-                                                 'owner'     => 'root',
-                                                 'group'     => 'root',
-                                                 'mode'      => '0644')
+      expect(subject).to contain_file(filename).with('ensure' => 'present',
+                                                     'content' => %r{Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;},
+                                                     'owner' => 'root',
+                                                     'group' => 'root')
     }
 
     context 'with notify_update = true (default)' do
@@ -59,12 +67,12 @@ describe 'apt::conf', type: :define do
   describe 'when creating a preference without content' do
     let :params do
       {
-        priority: '00',
+        priority: '00'
       }
     end
 
     it 'fails' do
-      expect { subject.call } .to raise_error(%r{pass in content})
+      expect(subject).to raise_error(%r{pass in content})
     end
   end
 
@@ -72,7 +80,7 @@ describe 'apt::conf', type: :define do
     let :params do
       {
         ensure: 'absent',
-        priority: '00',
+        priority: '00'
       }
     end
 
@@ -81,10 +89,9 @@ describe 'apt::conf', type: :define do
     end
 
     it {
-      is_expected.to contain_file(filename).with('ensure' => 'absent',
-                                                 'owner'     => 'root',
-                                                 'group'     => 'root',
-                                                 'mode'      => '0644')
+      expect(subject).to contain_file(filename).with('ensure' => 'absent',
+                                                     'owner' => 'root',
+                                                     'group' => 'root')
     }
   end
 end