Fix spec file loading annoyances

- Don't load all knife subcommands. Fixes error running tests on 1.8
  when you have 1.9-only plugins installed.
- Adjust spec file loading to use paths relative to spec/

1 files changed, 7 insertions, 1 deletions

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c3619dd773..0cdbfe97e4 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -53,7 +53,12 @@ end
 
 require 'chef'
 require 'chef/knife'
-Chef::Knife.load_commands
+
+Dir['lib/chef/knife/**/*.rb'].
+  map {|f| f.gsub('lib/', '') }.
+  map {|f| f.gsub(%r[\.rb$], '') }.
+  each {|f| require f }
+
 require 'chef/mixins'
 require 'chef/dsl'
 require 'chef/application'
@@ -75,6 +80,7 @@ require 'spec/support/platform_helpers'
 Dir["spec/support/**/*.rb"].
   reject { |f| f =~ %r{^spec/support/platforms} }.
   map { |f| f.gsub(%r{.rb$}, '') }.
+  map { |f| f.gsub(%r[spec/], '')}.
   each { |f| require f }
 
 RSpec.configure do |config|