summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xspec/integration/indirector/certificate/rest.rb4
-rwxr-xr-xspec/integration/indirector/certificate_request/rest.rb4
-rwxr-xr-xspec/integration/indirector/certificate_revocation_list/rest.rb4
-rw-r--r--spec/integration/indirector/report/rest.rb2
-rwxr-xr-xspec/integration/indirector/rest.rb10
5 files changed, 19 insertions, 5 deletions
diff --git a/spec/integration/indirector/certificate/rest.rb b/spec/integration/indirector/certificate/rest.rb
index e1f15d9c9..c42bafbd0 100755
--- a/spec/integration/indirector/certificate/rest.rb
+++ b/spec/integration/indirector/certificate/rest.rb
@@ -46,7 +46,9 @@ describe "Certificate REST Terminus" do
# passed through REST; otherwise we'd be stubbing 'find', which would cause an immediate
# return.
@mock_model = stub('faked model', :name => "certificate")
- Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model)
+ Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model)
+
+ Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:authorized?).returns(true)
end
after do
diff --git a/spec/integration/indirector/certificate_request/rest.rb b/spec/integration/indirector/certificate_request/rest.rb
index 59d2a5486..138187691 100755
--- a/spec/integration/indirector/certificate_request/rest.rb
+++ b/spec/integration/indirector/certificate_request/rest.rb
@@ -51,7 +51,9 @@ describe "Certificate Request REST Terminus" do
# passed through REST; otherwise we'd be stubbing 'find', which would cause an immediate
# return.
@mock_model = stub('faked model', :name => "certificate request")
- Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model)
+ Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model)
+
+ Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:authorized?).returns(true)
end
after do
diff --git a/spec/integration/indirector/certificate_revocation_list/rest.rb b/spec/integration/indirector/certificate_revocation_list/rest.rb
index 5ad2d8c90..a1ba4f9a0 100755
--- a/spec/integration/indirector/certificate_revocation_list/rest.rb
+++ b/spec/integration/indirector/certificate_revocation_list/rest.rb
@@ -55,7 +55,9 @@ describe "Certificate REST Terminus" do
# passed through REST; otherwise we'd be stubbing 'find', which would cause an immediate
# return.
@mock_model = stub('faked model', :name => "certificate")
- Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model)
+ Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model)
+
+ Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:authorized?).returns(true)
end
after do
diff --git a/spec/integration/indirector/report/rest.rb b/spec/integration/indirector/report/rest.rb
index 6bbfbee66..115007588 100644
--- a/spec/integration/indirector/report/rest.rb
+++ b/spec/integration/indirector/report/rest.rb
@@ -49,6 +49,8 @@ describe "Report REST Terminus" do
@report = stub_everything 'report'
@mock_model = stub_everything 'faked model', :name => "report", :convert_from => @report
Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model)
+
+ Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:authorized?).returns(true)
end
after do
diff --git a/spec/integration/indirector/rest.rb b/spec/integration/indirector/rest.rb
index 95fb34bd9..34619c409 100755
--- a/spec/integration/indirector/rest.rb
+++ b/spec/integration/indirector/rest.rb
@@ -75,7 +75,10 @@ describe Puppet::Indirector::REST do
# passed through REST; otherwise we'd be stubbing 'find', which would cause an immediate
# return.
@mock_model = stub('faked model', :name => "foo")
- Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model)
+ Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model)
+
+ # do not trigger the authorization layer
+ Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:authorized?).returns(true)
end
describe "when finding a model instance over REST" do
@@ -305,7 +308,10 @@ describe Puppet::Indirector::REST do
# passed through REST; otherwise we'd be stubbing 'find', which would cause an immediate
# return.
@mock_model = stub('faked model', :name => "foo")
- Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model)
+ Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model)
+
+ # do not trigger the authorization layer
+ Puppet::Network::HTTP::MongrelREST.any_instance.stubs(:authorized?).returns(true)
end
after do