diff options
Diffstat (limited to 'chef/tasks')
| -rw-r--r-- | chef/tasks/rspec.rb | 41 |
1 files changed, 17 insertions, 24 deletions
diff --git a/chef/tasks/rspec.rb b/chef/tasks/rspec.rb index 4a572ddf45..e2ea2f47cb 100644 --- a/chef/tasks/rspec.rb +++ b/chef/tasks/rspec.rb @@ -23,27 +23,27 @@ require 'rake' CHEF_ROOT = File.join(File.dirname(__FILE__), "..") begin - require 'spec/rake/spectask' + require 'rspec/core/rake_task' task :default => :spec desc "Run all specs in spec directory" - Spec::Rake::SpecTask.new(:spec) do |t| - t.spec_opts = ['--options', "\"#{CHEF_ROOT}/spec/spec.opts\""] - t.spec_files = FileList['spec/unit/**/*_spec.rb'] + RSpec::Core::RakeTask.new(:spec) do |t| + t.rspec_opts = ['--options', "\"#{CHEF_ROOT}/.rspec\""] + t.pattern = FileList['spec/unit/**/*_spec.rb'] end desc "Run all functional specs (in functional/ directory)" - Spec::Rake::SpecTask.new(:functional) do |t| - t.spec_opts = ['--options', "\"#{CHEF_ROOT}/spec/spec.opts\""] - t.spec_files = FileList['spec/functional/**/*_spec.rb'] + RSpec::Core::RakeTask.new(:functional) do |t| + t.rspec_opts = ['--options', "\"#{CHEF_ROOT}/spec/spec.opts\""] + t.pattern = FileList['spec/functional/**/*_spec.rb'] end namespace :spec do desc "Run all specs in spec directory with RCov" - Spec::Rake::SpecTask.new(:rcov) do |t| - t.spec_opts = ['--options', "\"#{CHEF_ROOT}/spec/spec.opts\""] - t.spec_files = FileList['spec/**/*_spec.rb'] + RSpec::Core::RakeTask.new(:rcov) do |t| + t.rspec_opts = ['--options', "\"#{CHEF_ROOT}/spec/spec.opts\""] + t.pattern = FileList['spec/**/*_spec.rb'] t.rcov = true t.rcov_opts = lambda do IO.readlines("#{CHEF_ROOT}/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten @@ -51,26 +51,19 @@ begin end desc "Print Specdoc for all specs" - Spec::Rake::SpecTask.new(:doc) do |t| - t.spec_opts = ["--format", "specdoc", "--dry-run"] - t.spec_files = FileList['spec/**/*_spec.rb'] + RSpec::Core::RakeTask.new(:doc) do |t| + t.rspec_opts = ["--format", "specdoc", "--dry-run"] + t.pattern = FileList['spec/**/*_spec.rb'] end [:unit].each do |sub| desc "Run the specs under spec/#{sub}" - Spec::Rake::SpecTask.new(sub) do |t| - t.spec_opts = ['--options', "\"#{CHEF_ROOT}/spec/spec.opts\""] - t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"] + RSpec::Core::RakeTask.new(sub) do |t| + t.rspec_opts = ['--options', "\"#{CHEF_ROOT}/spec/spec.opts\""] + t.pattern = FileList["spec/#{sub}/**/*_spec.rb"] end end - - desc "Translate/upgrade specs using the built-in translator" - task :translate do - translator = ::Spec::Translator.new - dir = CHEF_ROOT + '/spec' - translator.translate(dir, dir) - end end rescue LoadError - STDERR.puts "\n*** Rspec not available. (sudo) gem install rspec to run unit tests. ***\n\n" + STDERR.puts "\n*** RSpec not available. (sudo) gem install rspec to run unit tests. ***\n\n" end |