Permalink
Browse files

Remove use of spec.opts file, allowing Rake to run specs with rspec 1…

….2.9
  • Loading branch information...
1 parent f917300 commit 3d364a6b9186ca2fbac3b74e139679bb24e8eeb0 @jeremyevans committed Nov 16, 2009
Showing with 10 additions and 11 deletions.
  1. +10 −11 Rakefile
  2. 0 spec/spec.opts
View
@@ -116,7 +116,6 @@ begin
spec_opts = lambda do
lib_dir = File.join(File.dirname(__FILE__), 'lib')
ENV['RUBYLIB'] ? (ENV['RUBYLIB'] += ":#{lib_dir}") : (ENV['RUBYLIB'] = lib_dir)
- File.read("spec/spec.opts").split("\n")
end
rcov_opts = lambda do
@@ -126,66 +125,66 @@ begin
desc "Run core and model specs with coverage"
Spec::Rake::SpecTask.new("spec_coverage") do |t|
t.spec_files = Dir["spec/{core,model}/*_spec.rb"]
- t.spec_opts = spec_opts.call
+ spec_opts.call
t.rcov, t.rcov_opts = rcov_opts.call
end
desc "Run core and model specs"
task :default => [:spec]
Spec::Rake::SpecTask.new("spec") do |t|
t.spec_files = Dir["spec/{core,model}/*_spec.rb"]
- t.spec_opts = spec_opts.call
+ spec_opts.call
end
desc "Run core specs"
Spec::Rake::SpecTask.new("spec_core") do |t|
t.spec_files = Dir["spec/core/*_spec.rb"]
- t.spec_opts = spec_opts.call
+ spec_opts.call
end
desc "Run model specs"
Spec::Rake::SpecTask.new("spec_model") do |t|
t.spec_files = Dir["spec/model/*_spec.rb"]
- t.spec_opts = spec_opts.call
+ spec_opts.call
end
desc "Run extension/plugin specs"
Spec::Rake::SpecTask.new("spec_plugin") do |t|
t.spec_files = Dir["spec/extensions/*_spec.rb"]
- t.spec_opts = spec_opts.call
+ spec_opts.call
end
desc "Run extention/plugin specs with coverage"
Spec::Rake::SpecTask.new("spec_plugin_cov") do |t|
t.spec_files = Dir["spec/extensions/*_spec.rb"]
- t.spec_opts = spec_opts.call
+ spec_opts.call
t.rcov, t.rcov_opts = rcov_opts.call
end
desc "Run integration tests"
Spec::Rake::SpecTask.new("integration") do |t|
t.spec_files = Dir["spec/integration/*_test.rb"]
- t.spec_opts = spec_opts.call
+ spec_opts.call
end
desc "Run integration tests with coverage"
Spec::Rake::SpecTask.new("integration_cov") do |t|
t.spec_files = Dir["spec/integration/*_test.rb"]
- t.spec_opts = spec_opts.call
+ spec_opts.call
t.rcov, t.rcov_opts = rcov_opts.call
end
%w'postgres sqlite mysql informix oracle firebird mssql'.each do |adapter|
desc "Run #{adapter} specs"
Spec::Rake::SpecTask.new("spec_#{adapter}") do |t|
t.spec_files = ["spec/adapters/#{adapter}_spec.rb"] + Dir["spec/integration/*_test.rb"]
- t.spec_opts = spec_opts.call
+ spec_opts.call
end
desc "Run #{adapter} specs with coverage"
Spec::Rake::SpecTask.new("spec_#{adapter}_cov") do |t|
t.spec_files = ["spec/adapters/#{adapter}_spec.rb"] + Dir["spec/integration/*_test.rb"]
- t.spec_opts = spec_opts.call
+ spec_opts.call
t.rcov, t.rcov_opts = rcov_opts.call
end
end
View
No changes.

0 comments on commit 3d364a6

Please sign in to comment.