summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2008-07-02 08:56:57 +1000
committerJames Turnbull <james@lovedthanlost.net>2008-07-02 08:56:57 +1000
commit4bdb793092a1aee1798d921cb82ee9c12f0c51be (patch)
tree5fead57ddcc75696be6b7cbdf2d84053309acc08
parentee9d0025eeebda1522d450b5bd3cda769d7455d5 (diff)
parentf1d59034e8100d188b1cf4e5d6f5b6f71a4b91b9 (diff)
Merge branch 'tickets/0.24.x/1388' of git://github.com/lak/puppet into 0.24.x
-rwxr-xr-xspec/integration/type/package.rb10
1 files changed, 4 insertions, 6 deletions
diff --git a/spec/integration/type/package.rb b/spec/integration/type/package.rb
index c244fa1cd..def44ad97 100755
--- a/spec/integration/type/package.rb
+++ b/spec/integration/type/package.rb
@@ -2,12 +2,10 @@
require File.dirname(__FILE__) + '/../../spec_helper'
-require 'puppet/type/package'
-
-describe Puppet::Type::Package, "when choosing a default package provider" do
+describe Puppet::Type.type(:package), "when choosing a default package provider" do
before do
# the default provider is cached.
- Puppet::Type::Package.defaultprovider = nil
+ Puppet::Type.type(:package).defaultprovider = nil
end
def provider_name(os)
@@ -15,10 +13,10 @@ describe Puppet::Type::Package, "when choosing a default package provider" do
end
it "should have a default provider" do
- Puppet::Type::Package.defaultprovider.should_not be_nil
+ Puppet::Type.type(:package).defaultprovider.should_not be_nil
end
it "should choose the correct provider each platform" do
- Puppet::Type::Package.defaultprovider.name.should == provider_name(Facter.value(:operatingsystem))
+ Puppet::Type.type(:package).defaultprovider.name.should == provider_name(Facter.value(:operatingsystem))
end
end