diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-07-23 09:25:34 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-07-23 09:25:34 -0700 |
| commit | 731c07e8768cbe39d75aa55f71fa69a06c6359c2 (patch) | |
| tree | dd3cb4e354d91f8ee472202f54dd91bdf1b9d451 /spec/spec_helper.rb | |
| parent | 730aee4ef999b73a16d13a6792e10343dbdcabea (diff) | |
| parent | c1297755d4af11eb918ad987983ebd8398e38f58 (diff) | |
| download | puppet-stdlib-731c07e8768cbe39d75aa55f71fa69a06c6359c2.tar.gz puppet-stdlib-731c07e8768cbe39d75aa55f71fa69a06c6359c2.tar.bz2 | |
Merge pull request #80 from jeffmccune/fix/2.3.x/go_green
Fix up 2.3.x for new scope
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index f64fcba..8ae9ad3 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -10,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 |