Merge pull request #553 from bmjen/2.1.x_mergeback

[puppet-modules/puppetlabs-apt.git] / spec / classes / params_spec.rb

diff --git a/spec/classes/params_spec.rb b/spec/classes/params_spec.rb
index aa330bb987649ac03eeefc237164b09ad276d3ef..e9eb6fb9d6463936ef924a18cccf376ba0f72fab 100644 (file)
--- a/spec/classes/params_spec.rb
+++ b/spec/classes/params_spec.rb
@@ -1,27 +1,25 @@
 require 'spec_helper'
 describe 'apt::params', :type => :class do
-  let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian' } }
+  let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian', :lsbdistcodename => 'wheezy', :puppetversion   => Puppet.version, } }
   let (:title) { 'my_package' }
 
-  it { should contain_apt__params }
+  it { is_expected.to contain_apt__params }
 
   # There are 4 resources in this class currently
   # there should not be any more resources because it is a params class
   # The resources are class[apt::params], class[main], class[settings], stage[main]
   it "Should not contain any resources" do
-    subject.resources.size.should == 4
+    expect(subject.call.resources.size).to eq(4)
   end
 
-  describe "With unknown lsbdistid" do
-
-    let(:facts) { { :lsbdistid => 'CentOS' } }
+  describe "With lsb-release not installed" do
+    let(:facts) { { :osfamily => 'Debian', :puppetversion   => Puppet.version, } }
     let (:title) { 'my_package' }
 
     it do
       expect {
-       should compile
-      }.to raise_error(Puppet::Error, /Unsupported lsbdistid/)
+        subject.call
+      }.to raise_error(Puppet::Error, /Unable to determine lsbdistid, please install lsb-release first/)
     end
-
   end
 end