summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2009-02-14 09:26:21 -0600
committerLuke Kanies <luke@madstop.com>2009-02-14 22:23:53 -0600
commit495ad6654643ee7cfc500a174d36fe67eb8970b1 (patch)
treef365f155f46479ca6824252e475e972cdf334b2d
parent21a714aa75ff896fa67160a5ceaa26b6c0df98f5 (diff)
downloadpuppet-495ad6654643ee7cfc500a174d36fe67eb8970b1.tar.gz
puppet-495ad6654643ee7cfc500a174d36fe67eb8970b1.tar.xz
puppet-495ad6654643ee7cfc500a174d36fe67eb8970b1.zip
Fixing broken filetype tests resulting from the loss of Type[]
Signed-off-by: Luke Kanies <luke@madstop.com>
-rw-r--r--spec/unit/util/filetype.rb12
1 files changed, 1 insertions, 11 deletions
diff --git a/spec/unit/util/filetype.rb b/spec/unit/util/filetype.rb
index 0506b6b47..cdc1b3fe2 100644
--- a/spec/unit/util/filetype.rb
+++ b/spec/unit/util/filetype.rb
@@ -27,20 +27,10 @@ describe Puppet::Util::FileType do
@file.backup
end
- it "should use the filebucket named 'puppet' if it finds one" do
+ it "should use the default filebucket" do
bucket = mock 'bucket'
bucket.expects(:bucket).returns "mybucket"
- Puppet::Type.type(:filebucket).expects(:[]).with("puppet").returns bucket
-
- @file.bucket.should == "mybucket"
- end
-
- it "should use the default filebucket if none named 'puppet' is found" do
- bucket = mock 'bucket'
- bucket.expects(:bucket).returns "mybucket"
-
- Puppet::Type.type(:filebucket).expects(:[]).with("puppet").returns nil
Puppet::Type.type(:filebucket).expects(:mkdefaultbucket).returns bucket
@file.bucket.should == "mybucket"