From fca467da6013dfeb1015a82e178d0db241eaa54e Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Tue, 18 Mar 2008 16:33:48 -0500 Subject: Removing explicit requires of types and providers, because they were conflicting with Puppet's autoloading. This is clearly a sign that our autoloading is silly, if Ruby's own loading easily makes it unhappy. --- spec/unit/ral/provider/interface/redhat.rb | 3 --- spec/unit/ral/type/file.rb | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'spec/unit') diff --git a/spec/unit/ral/provider/interface/redhat.rb b/spec/unit/ral/provider/interface/redhat.rb index 0b3b75ffc..9bf1b9722 100755 --- a/spec/unit/ral/provider/interface/redhat.rb +++ b/spec/unit/ral/provider/interface/redhat.rb @@ -5,9 +5,6 @@ require File.dirname(__FILE__) + '/../../../../spec_helper' -require 'puppet/provider/interface/redhat' - - provider_class = Puppet::Type.type(:interface).provider(:redhat) describe provider_class do diff --git a/spec/unit/ral/type/file.rb b/spec/unit/ral/type/file.rb index b213987bb..1ef924569 100755 --- a/spec/unit/ral/type/file.rb +++ b/spec/unit/ral/type/file.rb @@ -2,9 +2,7 @@ require File.dirname(__FILE__) + '/../../../spec_helper' -require 'puppet/type/file' - -describe Puppet::Type::File do +describe Puppet::Type.type(:file) do before do @path = Tempfile.new("puppetspec") @path.close!() -- cgit