summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--spec/unit/application/puppetmasterd.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/unit/application/puppetmasterd.rb b/spec/unit/application/puppetmasterd.rb
index df6f87895..59377abb0 100644
--- a/spec/unit/application/puppetmasterd.rb
+++ b/spec/unit/application/puppetmasterd.rb
@@ -264,7 +264,6 @@ describe "PuppetMaster" do
@server = stub_everything 'server'
Puppet::Network::Server.stubs(:new).returns(@server)
@app = stub_everything 'app'
- Puppet::Network::HTTP::Rack.stubs(:new).returns(@app)
Puppet::SSL::Host.stubs(:localhost)
Puppet::SSL::CertificateAuthority.stubs(:ca?)
Process.stubs(:uid).returns(1000)
@@ -338,6 +337,11 @@ describe "PuppetMaster" do
describe "with --rack" do
confine "Rack is not available" => Puppet.features.rack?
+ before do
+ require 'puppet/network/http/rack'
+ Puppet::Network::HTTP::Rack.stubs(:new).returns(@app)
+ end
+
it "it should create the app with REST and XMLRPC support" do
@puppetmasterd.options.stubs(:[]).with(:rack).returns(:true)