diff options
| author | Chris Price <chris@puppetlabs.com> | 2012-06-26 17:44:39 -0700 |
|---|---|---|
| committer | Chris Price <chris@puppetlabs.com> | 2012-06-26 17:44:39 -0700 |
| commit | 29f8f89c19b2189aa78ab430e94671669cb4716c (patch) | |
| tree | 51b8c47d5576217b4bc8bf45510f38790b43b806 /spec/spec_helper.rb | |
| parent | e299ac6212b0468426f971b216447ef6bc679149 (diff) | |
| parent | d9410f72e416da15eb1660d15ba2b4288ccc0873 (diff) | |
Merge pull request #73 from branan/use_spechelper_gem
Update for new gem version of puppetlabs_spec_helper
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 f64fcba..3fdcbbc 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,28 +1,4 @@ -dir = File.expand_path(File.dirname(__FILE__)) -$LOAD_PATH.unshift File.join(dir, 'lib') - -# Don't want puppet getting the command line arguments for rake or autotest -ARGV.clear - -require 'puppet' -require 'facter' -require 'mocha' -gem 'rspec', '>=2.0.0' -require 'rspec/expectations' - - -# 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' - +require 'puppetlabs_spec_helper/puppet_spec_helper' RSpec.configure do |config| |