diff options
| author | Branan Purvine-Riley <branan@puppetlabs.com> | 2012-05-29 13:55:26 -0700 |
|---|---|---|
| committer | Branan Purvine-Riley <branan@puppetlabs.com> | 2012-05-29 15:53:46 -0700 |
| commit | 2247df4f6e828d6791a46cb12d4e2df2e0b98dce (patch) | |
| tree | 6c402ed6bbe5cfe916db54a24ce4495719598035 /spec/spec_helper.rb | |
| parent | cf7ac0286043d01aa807743d75574d450536582d (diff) | |
| download | puppet-stdlib-2247df4f6e828d6791a46cb12d4e2df2e0b98dce.tar.gz puppet-stdlib-2247df4f6e828d6791a46cb12d4e2df2e0b98dce.tar.bz2 | |
Update for new gem version of puppetlabs_spec_helper
This updates the Rakefile and spec_helper to use the common versions
available in the puppetlabs_spec_helper rubygem branch. This mostly
just removes a bunch of duplicated code, but it also gives us more
flexibility in how the module is tested in the future.
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..0fd4a26 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 'puppet_module_spec_helper/puppet_spec_helper' RSpec.configure do |config| |