diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2010-12-16 14:50:39 -0800 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2010-12-16 14:50:39 -0800 |
| commit | cc1f2b39a65e8b74c8e59a2bf7d8f47a35985ee4 (patch) | |
| tree | 2be10cd07b1c8c45d63ec38adb7f35927841b864 /spec/unit/network/http | |
| parent | 52ca8c78c270b93ce997217900a3d333ad8154cc (diff) | |
| parent | b4035315aaad37df97d4e620b4f972cad201d04f (diff) | |
Merge branch '2.6.next' into 2.6.x
* 2.6.next:
maint: Fix ActiveRecord confine issue
maint: Fix a test that was missing a require
maint: Fix tests that don't run on their own
Diffstat (limited to 'spec/unit/network/http')
| -rwxr-xr-x | spec/unit/network/http/rack/xmlrpc_spec.rb | 1 | ||||
| -rwxr-xr-x | spec/unit/network/http/rack_spec.rb | 1 | ||||
| -rwxr-xr-x | spec/unit/network/http/webrick_spec.rb | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/spec/unit/network/http/rack/xmlrpc_spec.rb b/spec/unit/network/http/rack/xmlrpc_spec.rb index 63ba28bf2..870438f2c 100755 --- a/spec/unit/network/http/rack/xmlrpc_spec.rb +++ b/spec/unit/network/http/rack/xmlrpc_spec.rb @@ -1,6 +1,7 @@ #!/usr/bin/env ruby require File.dirname(__FILE__) + '/../../../../spec_helper' +require 'puppet/network/handler' require 'puppet/network/http/rack' if Puppet.features.rack? require 'puppet/network/http/rack/xmlrpc' if Puppet.features.rack? diff --git a/spec/unit/network/http/rack_spec.rb b/spec/unit/network/http/rack_spec.rb index df42a1ffa..8be9ccb50 100755 --- a/spec/unit/network/http/rack_spec.rb +++ b/spec/unit/network/http/rack_spec.rb @@ -1,6 +1,7 @@ #!/usr/bin/env ruby require File.dirname(__FILE__) + '/../../../spec_helper' +require 'puppet/network/handler' require 'puppet/network/http/rack' if Puppet.features.rack? describe "Puppet::Network::HTTP::Rack" do diff --git a/spec/unit/network/http/webrick_spec.rb b/spec/unit/network/http/webrick_spec.rb index 2a6ef2268..8e7c92b71 100755 --- a/spec/unit/network/http/webrick_spec.rb +++ b/spec/unit/network/http/webrick_spec.rb @@ -4,6 +4,7 @@ # Copyright (c) 2007. All rights reserved. require File.dirname(__FILE__) + '/../../../spec_helper' +require 'puppet/network/handler' require 'puppet/network/http' require 'puppet/network/http/webrick' |