diff options
author | Jeff McCune <jeff@puppetlabs.com> | 2012-07-19 16:36:26 -0700 |
---|---|---|
committer | Jeff McCune <jeff@puppetlabs.com> | 2012-07-19 16:36:26 -0700 |
commit | 6a63fdfa53bbe742006af89dfbc7e2882b4682ee (patch) | |
tree | e7c706007de1e1b708ff5c9c1a68b49b570c72d0 /spec/spec_helper.rb | |
parent | 7d3433345e5c4a35b340f628cd7d7015aadfa9a4 (diff) | |
parent | 8a4e115ccb14d409878d46d456cc9b93fdc24867 (diff) | |
download | puppet-stdlib-6a63fdfa53bbe742006af89dfbc7e2882b4682ee.tar.gz puppet-stdlib-6a63fdfa53bbe742006af89dfbc7e2882b4682ee.tar.bz2 |
Merge branch 'fix/2.2.x/make_it_green' into 2.2.x
* fix/2.2.x/make_it_green:
(Maint) use PuppetlabsSpec::PuppetSeams.parser_scope
(Maint) Fix interpreter lines
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r-- | spec/spec_helper.rb | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 04c08db..8ae9ad3 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,8 +1,6 @@ dir = File.expand_path(File.dirname(__FILE__)) $LOAD_PATH.unshift File.join(dir, 'lib') -p dir - # Don't want puppet getting the command line arguments for rake or autotest ARGV.clear @@ -12,27 +10,5 @@ require 'mocha' gem 'rspec', '>=2.0.0' require 'rspec/expectations' +require 'puppetlabs_spec_helper/module_spec_helper' -# So everyone else doesn't have to include this base constant. -module PuppetSpec - FIXTURE_DIR = File.join(dir = File.expand_path(File.dirname(__FILE__)), "fixtures") unless defined?(FIXTURE_DIR) -end - -# TODO: ultimately would like to move these requires into the puppet_spec_helper.rb file, but the namespaces -# are not currently the same between the two, so tests would need to be modified. Not ready to undertake that -# just yet. -require 'puppet_spec/files' - -require 'puppet_spec_helper' - - -RSpec.configure do |config| - - config.before :each do - GC.disable - end - - config.after :each do - GC.enable - end -end |