X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fdefines%2Fconf_spec.rb;h=5decab57e99b4c91dbec16825553cc17fc7dd31e;hb=98afb5d41bd3df7c633a55a83355a5d5f33606f2;hp=16507c2f6fd9adc360d4e25b551a48ab86fd5253;hpb=03681047ed16a1f88d63fe1cd07ea85815257b6f;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/defines/conf_spec.rb b/spec/defines/conf_spec.rb
index 16507c2..5decab5 100644
--- a/spec/defines/conf_spec.rb
+++ b/spec/defines/conf_spec.rb
@@ -1,24 +1,25 @@
 require 'spec_helper'
-describe 'apt::conf', :type => :define do
+describe 'apt::conf', type: :define do
   let :pre_condition do
     'class { "apt": }'
   end
-  let(:facts) { {
-    :os => { :family => 'Debian', :name => 'Debian', :release => { :major => '7', :full => '7.0' }},
-    :lsbdistid       => 'Debian',
-    :osfamily        => 'Debian',
-    :lsbdistcodename => 'wheezy',
-    :puppetversion   => Puppet.version,
-  } }
+  let(:facts) do
+    {
+      os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
+      lsbdistid: 'Debian',
+      osfamily: 'Debian',
+      lsbdistcodename: 'jessie',
+    }
+  end
   let :title do
     'norecommends'
   end
 
-  describe "when creating an apt preference" do
+  describe 'when creating an apt preference' do
     let :default_params do
       {
-        :priority => '00',
-        :content  => "Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n"
+        priority: '00',
+        content: "Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n",
       }
     end
     let :params do
@@ -26,65 +27,61 @@ describe 'apt::conf', :type => :define do
     end
 
     let :filename do
-      "/etc/apt/apt.conf.d/00norecommends"
+      '/etc/apt/apt.conf.d/00norecommends'
     end
 
-    it { is_expected.to contain_file(filename).with({
-          'ensure'    => 'present',
-          'content'   => /Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;/,
-          'owner'     => 'root',
-          'group'     => 'root',
-          'mode'      => '0644',
-        })
-      }
+    it {
+      is_expected.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
+    context 'with notify_update = true (default)' do
       let :params do
         default_params
       end
+
       it { is_expected.to contain_apt__setting("conf-#{title}").with_notify_update(true) }
     end
 
-    context "with notify_update = false" do
+    context 'with notify_update = false' do
       let :params do
-        default_params.merge({
-          :notify_update => false
-        })
+        default_params.merge(notify_update: false)
       end
+
       it { is_expected.to contain_apt__setting("conf-#{title}").with_notify_update(false) }
     end
   end
 
-  describe "when creating a preference without content" 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(/pass in content/)
+      is_expected.to raise_error(%r{pass in content})
     end
   end
 
-  describe "when removing an apt preference" do
+  describe 'when removing an apt preference' do
     let :params do
       {
-        :ensure   => 'absent',
-        :priority => '00',
+        ensure: 'absent',
+        priority: '00',
       }
     end
 
     let :filename do
-      "/etc/apt/apt.conf.d/00norecommends"
+      '/etc/apt/apt.conf.d/00norecommends'
     end
 
-    it { is_expected.to contain_file(filename).with({
-        'ensure'    => 'absent',
-        'owner'     => 'root',
-        'group'     => 'root',
-        'mode'      => '0644',
-      })
+    it {
+      is_expected.to contain_file(filename).with('ensure' => 'absent',
+                                                 'owner'     => 'root',
+                                                 'group'     => 'root')
     }
   end
 end