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/unit/application/agent_spec.rb | |
| 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/unit/application/agent_spec.rb')
| -rwxr-xr-x | spec/unit/application/agent_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/unit/application/agent_spec.rb b/spec/unit/application/agent_spec.rb index 804057868..ad2748b7f 100755 --- a/spec/unit/application/agent_spec.rb +++ b/spec/unit/application/agent_spec.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') +require 'spec_helper' require 'puppet/agent' require 'puppet/application/agent' |