Make it possible to run all tests even if mongrel isn't installed. Shouldn't "confine" produce some output when running spec? Who knows.

3 files changed, 12 insertions, 1 deletions

diff --git a/lib/puppet/network/http/mongrel.rb b/lib/puppet/network/http/mongrel.rb
index 3efc465ad..8ea669531 100644
--- a/lib/puppet/network/http/mongrel.rb
+++ b/lib/puppet/network/http/mongrel.rb
@@ -1,4 +1,5 @@
-require 'mongrel'
+require 'mongrel' if Puppet.features.mongrel?
+
 require 'puppet/network/http/mongrel/rest'
 require 'puppet/network/http/mongrel/xmlrpc'
 
diff --git a/spec/unit/network/http/mongrel.rb b/spec/unit/network/http/mongrel.rb
index bde16fee3..b6ad07567 100644
--- a/spec/unit/network/http/mongrel.rb
+++ b/spec/unit/network/http/mongrel.rb
@@ -7,12 +7,16 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 require 'puppet/network/http'
 
 describe Puppet::Network::HTTP::Mongrel, "after initializing" do
+    confine "Mongrel is not available" => Puppet.features.mongrel?
+    
     it "should not be listening" do
         Puppet::Network::HTTP::Mongrel.new.should_not be_listening
     end
 end
 
 describe Puppet::Network::HTTP::Mongrel, "when turning on listening" do
+    confine "Mongrel is not available" => Puppet.features.mongrel?
+
     before do
         @server = Puppet::Network::HTTP::Mongrel.new
         @mock_mongrel = mock('mongrel')
@@ -90,6 +94,8 @@ describe Puppet::Network::HTTP::Mongrel, "when turning on listening" do
 end
 
 describe Puppet::Network::HTTP::Mongrel, "when turning off listening" do
+    confine "Mongrel is not available" => Puppet.features.mongrel?
+    
     before do
         @mock_mongrel = mock('mongrel httpserver')
         @mock_mongrel.stubs(:run)
diff --git a/spec/unit/network/http/mongrel/rest.rb b/spec/unit/network/http/mongrel/rest.rb
index 15ee06c7e..16fe94edb 100644
--- a/spec/unit/network/http/mongrel/rest.rb
+++ b/spec/unit/network/http/mongrel/rest.rb
@@ -7,6 +7,8 @@ require File.dirname(__FILE__) + '/../../../../spec_helper'
 require 'puppet/network/http'
 
 describe Puppet::Network::HTTP::MongrelREST, "when initializing" do
+    confine "Mongrel is not available" => Puppet.features.mongrel?
+    
     before do
         @mock_mongrel = mock('Mongrel server')
         @mock_mongrel.stubs(:register)
@@ -49,6 +51,8 @@ describe Puppet::Network::HTTP::MongrelREST, "when initializing" do
 end
 
 describe Puppet::Network::HTTP::MongrelREST, "when receiving a request" do
+    confine "Mongrel is not available" => Puppet.features.mongrel?
+    
     before do
         @mock_request = mock('mongrel http request')
         @mock_response = mock('mongrel http response')