diff options
| author | Christian Hofstaedtler <hofstaedtler@inqnet.at> | 2009-05-11 21:55:51 +0000 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-05-20 18:37:10 +1000 |
| commit | a406d585ce861757d6c14e0696a3847b46e4319d (patch) | |
| tree | f114e50e9be5e9bf09ef35bf74bf754dae675d00 /spec/unit/network | |
| parent | c189b46e3f179ca60dfeb8e65080d19fe653e926 (diff) | |
| download | puppet-a406d585ce861757d6c14e0696a3847b46e4319d.tar.gz puppet-a406d585ce861757d6c14e0696a3847b46e4319d.tar.xz puppet-a406d585ce861757d6c14e0696a3847b46e4319d.zip | |
Fix for #2234: test fails with old Rack version
Diffstat (limited to 'spec/unit/network')
| -rwxr-xr-x | spec/unit/network/http/rack.rb | 2 | ||||
| -rwxr-xr-x | spec/unit/network/http/rack/rest.rb | 2 | ||||
| -rwxr-xr-x | spec/unit/network/http/rack/xmlrpc.rb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/spec/unit/network/http/rack.rb b/spec/unit/network/http/rack.rb index f639b2d4a..cd2961a3a 100755 --- a/spec/unit/network/http/rack.rb +++ b/spec/unit/network/http/rack.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby require File.dirname(__FILE__) + '/../../../spec_helper' -require 'puppet/network/http/rack' +require 'puppet/network/http/rack' if Puppet.features.rack? describe "Puppet::Network::HTTP::Rack" do confine "Rack is not available" => Puppet.features.rack? diff --git a/spec/unit/network/http/rack/rest.rb b/spec/unit/network/http/rack/rest.rb index 873483782..1e3efe9ca 100755 --- a/spec/unit/network/http/rack/rest.rb +++ b/spec/unit/network/http/rack/rest.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby require File.dirname(__FILE__) + '/../../../../spec_helper' -require 'puppet/network/http/rack' +require 'puppet/network/http/rack' if Puppet.features.rack? require 'puppet/network/http/rack/rest' describe "Puppet::Network::HTTP::RackREST" do diff --git a/spec/unit/network/http/rack/xmlrpc.rb b/spec/unit/network/http/rack/xmlrpc.rb index 38316d8bf..abfe84ba6 100755 --- a/spec/unit/network/http/rack/xmlrpc.rb +++ b/spec/unit/network/http/rack/xmlrpc.rb @@ -1,8 +1,8 @@ #!/usr/bin/env ruby require File.dirname(__FILE__) + '/../../../../spec_helper' -require 'puppet/network/http/rack' -require 'puppet/network/http/rack/xmlrpc' +require 'puppet/network/http/rack' if Puppet.features.rack? +require 'puppet/network/http/rack/xmlrpc' if Puppet.features.rack? describe "Puppet::Network::HTTP::RackXMLRPC" do confine "Rack is not available" => Puppet.features.rack? |