Signed-off-by: Luke Kanies <[EMAIL PROTECTED]>
---
spec/unit/module.rb | 4 ++--
spec/unit/network/http/mongrel.rb | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/spec/unit/module.rb b/spec/unit/module.rb
index 2dadaa5..e79001a 100755
--- a/spec/unit/module.rb
+++ b/spec/unit/module.rb
@@ -143,8 +143,8 @@ describe Puppet::Module, " when searching for manifests
when no module is found"
it "should look for files relative to the current directory" do
cwd = Dir.getwd
-
Dir.expects(:glob).with("#{cwd}/mymod/init.pp").returns(["#{cwd}/mymod/init.pp"])
- Puppet::Module.find_manifests("mymod/init.pp").should ==
["#{cwd}/mymod/init.pp"]
+
Dir.expects(:glob).with("#{cwd}/foobar/init.pp").returns(["#{cwd}/foobar/init.pp"])
+ Puppet::Module.find_manifests("foobar/init.pp").should ==
["#{cwd}/foobar/init.pp"]
end
it "should only return files, not directories" do
diff --git a/spec/unit/network/http/mongrel.rb
b/spec/unit/network/http/mongrel.rb
index 3a9cfb5..1732009 100755
--- a/spec/unit/network/http/mongrel.rb
+++ b/spec/unit/network/http/mongrel.rb
@@ -10,6 +10,8 @@ describe "Puppet::Network::HTTP::Mongrel", "after
initializing" do
confine "Mongrel is not available" => Puppet.features.mongrel?
it "should not be listening" do
+ require 'puppet/network/http/mongrel'
+
Puppet::Network::HTTP::Mongrel.new.should_not be_listening
end
end
@@ -18,6 +20,8 @@ describe "Puppet::Network::HTTP::Mongrel", "when turning on
listening" do
confine "Mongrel is not available" => Puppet.features.mongrel?
before do
+ require 'puppet/network/http/mongrel'
+
@server = Puppet::Network::HTTP::Mongrel.new
@mock_mongrel = mock('mongrel')
@mock_mongrel.stubs(:run)
--
1.5.3.7
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
