X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fclasses%2Fparams_spec.rb;h=e9eb6fb9d6463936ef924a18cccf376ba0f72fab;hb=f05e43c28588a280a42333f9ca3a506a7121849d;hp=d85e849d5ae31a370ccce001f274f449608f32f9;hpb=dde7f4e8199b319500d5a4d48fded93db725d905;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/classes/params_spec.rb b/spec/classes/params_spec.rb
index d85e849..e9eb6fb 100644
--- a/spec/classes/params_spec.rb
+++ b/spec/classes/params_spec.rb
@@ -1,39 +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
-  end
-
-  describe "With unknown lsbdistid" do
-
-    let(:facts) { { :lsbdistid => 'CentOS' } }
-    let (:title) { 'my_package' }
-
-    it do
-      expect {
-       should compile
-      }.to raise_error(Puppet::Error, /Unsupported lsbdistid/)
-    end
-
+    expect(subject.call.resources.size).to eq(4)
   end
 
   describe "With lsb-release not installed" do
-    let(:facts) { { :lsbdistid => '' } }
+    let(:facts) { { :osfamily => 'Debian', :puppetversion   => Puppet.version, } }
     let (:title) { 'my_package' }
 
     it do
       expect {
-        should compile
-      }.to raise_error(Puppet::Error, /Unable to determine lsbdistid, is lsb-release installed/)
+        subject.call
+      }.to raise_error(Puppet::Error, /Unable to determine lsbdistid, please install lsb-release first/)
     end
   end
-
 end