summaryrefslogtreecommitdiffstats
path: root/spec/unit/network/http_spec.rb
diff options
context:
space:
mode:
authorDaniel Pittman <daniel@puppetlabs.com>2011-04-08 16:06:57 -0700
committerDaniel Pittman <daniel@puppetlabs.com>2011-04-08 16:06:57 -0700
commit6ed00515e8614233160d74b1c32b75fab27ac722 (patch)
treeb5e2e6d988c7d426afe15e7380e871484595bd14 /spec/unit/network/http_spec.rb
parentab5f1e8ffbe6503687c6f46bcaed9316da0151b9 (diff)
downloadpuppet-6ed00515e8614233160d74b1c32b75fab27ac722.tar.gz
puppet-6ed00515e8614233160d74b1c32b75fab27ac722.tar.xz
puppet-6ed00515e8614233160d74b1c32b75fab27ac722.zip
maint: just require 'spec_helper', thanks rspec2
rspec2 automatically sets a bunch of load-path stuff we were by hand, so we can just stop. As a side-effect we can now avoid a whole pile of stupid things to try and include the spec_helper.rb file... ...and then we can stop protecting spec_helper from evaluating twice, since we now require it with a consistent name. Yay. Reviewed-By: Pieter van de Bruggen <pieter@puppetlabs.com>
Diffstat (limited to 'spec/unit/network/http_spec.rb')
-rwxr-xr-xspec/unit/network/http_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/unit/network/http_spec.rb b/spec/unit/network/http_spec.rb
index 8422e2113..27b652c71 100755
--- a/spec/unit/network/http_spec.rb
+++ b/spec/unit/network/http_spec.rb
@@ -3,7 +3,7 @@
# Created by Rick Bradley on 2007-10-03.
# Copyright (c) 2007. All rights reserved.
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
require 'puppet/network/http'