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/provider | |
| 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/provider')
| -rwxr-xr-x | spec/integration/provider/mailalias/aliases_spec.rb | 2 | ||||
| -rw-r--r-- | spec/integration/provider/mount_spec.rb | 2 | ||||
| -rwxr-xr-x | spec/integration/provider/package_spec.rb | 2 | ||||
| -rwxr-xr-x | spec/integration/provider/service/init_spec.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/spec/integration/provider/mailalias/aliases_spec.rb b/spec/integration/provider/mailalias/aliases_spec.rb index 19e430ba1..ac8095ac7 100755 --- a/spec/integration/provider/mailalias/aliases_spec.rb +++ b/spec/integration/provider/mailalias/aliases_spec.rb @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper') +require 'spec_helper' require 'shared_behaviours/all_parsedfile_providers' provider_class = Puppet::Type.type(:mailalias).provider(:aliases) diff --git a/spec/integration/provider/mount_spec.rb b/spec/integration/provider/mount_spec.rb index 646862050..4af0dca4a 100644 --- a/spec/integration/provider/mount_spec.rb +++ b/spec/integration/provider/mount_spec.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../spec_helper' +require 'spec_helper' require 'puppet/file_bucket/dipper' diff --git a/spec/integration/provider/package_spec.rb b/spec/integration/provider/package_spec.rb index cc03c57a7..00c52fc89 100755 --- a/spec/integration/provider/package_spec.rb +++ b/spec/integration/provider/package_spec.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') +require 'spec_helper' describe "Package Provider" do Puppet::Type.type(:package).providers.each do |name| diff --git a/spec/integration/provider/service/init_spec.rb b/spec/integration/provider/service/init_spec.rb index c74ce29fe..17b74ed0a 100755 --- a/spec/integration/provider/service/init_spec.rb +++ b/spec/integration/provider/service/init_spec.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper') +require 'spec_helper' provider = Puppet::Type.type(:service).provider(:init) |