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 e28296b2cc9e2ce1f0bb1692500ee19788d884d8..e9eb6fb9d6463936ef924a18cccf376ba0f72fab 100644 (file)
--- a/spec/classes/params_spec.rb
+++ b/spec/classes/params_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 describe 'apt::params', :type => :class do
-  let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian', :lsbdistcodename => 'wheezy', :puppetversion   => '3.5.0', } }
+  let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian', :lsbdistcodename => 'wheezy', :puppetversion   => Puppet.version, } }
   let (:title) { 'my_package' }
 
   it { is_expected.to contain_apt__params }
@@ -13,27 +13,13 @@ describe 'apt::params', :type => :class do
   end
 
   describe "With lsb-release not installed" do
-    let(:facts) { { :osfamily => 'Debian', :puppetversion   => '3.5.0', } }
+    let(:facts) { { :osfamily => 'Debian', :puppetversion   => Puppet.version, } }
     let (:title) { 'my_package' }
 
     it do
       expect {
         subject.call
-      }.to raise_error(Puppet::Error, /Unable to determine lsbdistid, is lsb-release installed/)
+      }.to raise_error(Puppet::Error, /Unable to determine lsbdistid, please install lsb-release first/)
     end
   end
-
-  describe "With old puppet version" do
-    let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian', :lsbdistcodename => 'wheezy', :lsbdistrelease => 'foo', :lsbdistdescription => 'bar', :lsbminordistrelease => 'baz', :lsbmajdistrelease => 'foobar', :puppetversion   => '3.4.0', } }
-    let(:title) { 'my_package' }
-    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
-      expect(subject.call.resources.size).to eq(4)
-    end
-  end
-
 end