summaryrefslogtreecommitdiffstats
path: root/test/lib
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-02-13 16:52:26 -0600
committerLuke Kanies <luke@madstop.com>2008-02-13 16:52:26 -0600
commitf8afe131699f1f0afe834b070af285fd56f6320d (patch)
tree7f3c5db91aeefaaaf4ffeb3efdaa80f6efe995fb /test/lib
parentfe02591eaad7c8648699b53c9361ffab851e2022 (diff)
downloadpuppet-f8afe131699f1f0afe834b070af285fd56f6320d.tar.gz
puppet-f8afe131699f1f0afe834b070af285fd56f6320d.tar.xz
puppet-f8afe131699f1f0afe834b070af285fd56f6320d.zip
Fixed #1043 -- autoloading now searches the plugins directory
in each module, in addition to the lib directory. The 'lib' directory is also deprecated, but supported for now to give people a chance to convert.
Diffstat (limited to 'test/lib')
-rwxr-xr-xtest/lib/puppettest.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb
index 64cb7aebe..902831e68 100755
--- a/test/lib/puppettest.rb
+++ b/test/lib/puppettest.rb
@@ -17,6 +17,8 @@ Dir["#{mainlib}/../vendor/gems/**"].each do |path|
end
end
+require 'mocha'
+
# Only load the test/unit class if we're not in the spec directory.
# Else we get the bogus 'no tests, no failures' message.
unless Dir.getwd =~ /spec/