diff options
| author | Daniel Pittman <daniel@puppetlabs.com> | 2011-04-08 16:06:57 -0700 |
|---|---|---|
| committer | Daniel Pittman <daniel@puppetlabs.com> | 2011-04-08 16:06:57 -0700 |
| commit | 6ed00515e8614233160d74b1c32b75fab27ac722 (patch) | |
| tree | b5e2e6d988c7d426afe15e7380e871484595bd14 /spec/integration/network | |
| parent | ab5f1e8ffbe6503687c6f46bcaed9316da0151b9 (diff) | |
| download | puppet-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/integration/network')
| -rwxr-xr-x | spec/integration/network/client_spec.rb | 2 | ||||
| -rwxr-xr-x | spec/integration/network/formats_spec.rb | 2 | ||||
| -rwxr-xr-x | spec/integration/network/handler_spec.rb | 2 | ||||
| -rwxr-xr-x | spec/integration/network/server/mongrel_spec.rb | 2 | ||||
| -rwxr-xr-x | spec/integration/network/server/webrick_spec.rb | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/spec/integration/network/client_spec.rb b/spec/integration/network/client_spec.rb index 07a491b1b..574da6a78 100755 --- a/spec/integration/network/client_spec.rb +++ b/spec/integration/network/client_spec.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') +require 'spec_helper' require 'puppet/network/client' diff --git a/spec/integration/network/formats_spec.rb b/spec/integration/network/formats_spec.rb index 8eb963e19..44f153d33 100755 --- a/spec/integration/network/formats_spec.rb +++ b/spec/integration/network/formats_spec.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') +require 'spec_helper' require 'puppet/network/formats' diff --git a/spec/integration/network/handler_spec.rb b/spec/integration/network/handler_spec.rb index a3095c125..5012d3ab9 100755 --- a/spec/integration/network/handler_spec.rb +++ b/spec/integration/network/handler_spec.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') +require 'spec_helper' require 'puppet/network/client' diff --git a/spec/integration/network/server/mongrel_spec.rb b/spec/integration/network/server/mongrel_spec.rb index aeaaad6ae..2a18cb569 100755 --- a/spec/integration/network/server/mongrel_spec.rb +++ b/spec/integration/network/server/mongrel_spec.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper') +require 'spec_helper' require 'puppet/network/server' require 'socket' diff --git a/spec/integration/network/server/webrick_spec.rb b/spec/integration/network/server/webrick_spec.rb index 0e1bb4580..b39dd2378 100755 --- a/spec/integration/network/server/webrick_spec.rb +++ b/spec/integration/network/server/webrick_spec.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper') +require 'spec_helper' require 'puppet/network/server' require 'puppet/ssl/certificate_authority' require 'socket' |