diff options
| author | Daniel Pittman <daniel@rimspace.net> | 2011-03-03 00:41:04 -0800 |
|---|---|---|
| committer | Daniel Pittman <daniel@rimspace.net> | 2011-03-03 16:30:13 -0800 |
| commit | 92499c86bc7fcc4c7b7d5de838973868a5e0aba2 (patch) | |
| tree | f332052d10fa35024da15f2131f662b9a43107bc | |
| parent | 3954576bca044e4fa9c3d74047fdd0833be0c5b6 (diff) | |
(#6582) Eliminate the last vestige of the unit tests from the specs.
This eliminates a stub module in spec_helper, which was used for compatibility
with code that didn't bother to require the right files out of the unit tests.
It also removes test/lib from LOAD_PATH when running specs, since we don't run
with that code, and now we detect that as a larger scale test failure.
Reviewed-By: Nick Lewis <nick@puppetlabs.com>
| -rw-r--r-- | spec/spec_helper.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 7f3654456..8d539fa26 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -6,7 +6,6 @@ dir = File.expand_path(File.dirname(__FILE__)) $LOAD_PATH.unshift("#{dir}/") $LOAD_PATH.unshift("#{dir}/lib") # a spec-specific test lib dir $LOAD_PATH.unshift("#{dir}/../lib") -$LOAD_PATH.unshift("#{dir}/../test/lib") # Don't want puppet getting the command line arguments for rake or autotest ARGV.clear @@ -20,9 +19,6 @@ module PuppetSpec FIXTURE_DIR = File.join(dir = File.expand_path(File.dirname(__FILE__)), "fixtures") unless defined?(FIXTURE_DIR) end -module PuppetTest -end - require 'lib/puppet_spec/files' require 'lib/puppet_spec/fixtures' require 'monkey_patches/alias_should_to_must' |