Rakefile.erb in methadone-2.0.0

- old
+ new

@@ -33,12 +33,10 @@
 raise
 end
 <% else %>
 require 'rake/testtask'
 <% end %>
-require 'cucumber'
-require 'cucumber/rake/task'
 gem 'rdoc' # we need the installed RDoc gem, not the system one
 require 'rdoc/task'
 
 include Rake::DSL
 
@@ -48,27 +46,26 @@
 RSpec::Core::RakeTask.new do |t|
   # Put spec opts in a file named .rspec in root
 end
 <% else %>
 Rake::TestTask.new do |t|
-  t.pattern = 'test/tc_*.rb'
+  t.pattern = 'test/unit/test_*.rb'
 end
-<% end %>
 
-CUKE_RESULTS = 'results.html'
-CLEAN << CUKE_RESULTS
-Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = "features --format html -o #{CUKE_RESULTS} --format pretty --no-source -x"
-  t.fork = false
+Rake::TestTask.new("test:integration") do |t|
+  t.pattern = 'test/integration/test_*.rb'
 end
+<% end %>
 
 Rake::RDocTask.new do |rd|
   <% if using_readme %>
   rd.main = "README.rdoc"
-  <% end %>
   rd.rdoc_files.include("README.rdoc","lib/**/*.rb","bin/**/*")
+  <% else %>
+  rd.rdoc_files.include("lib/**/*.rb","bin/**/*")
+  <% end %>
 end
 <% if rspec %>
-task :default => [:spec,:features]
+task :default => [:spec]
 <% else %>
-task :default => [:test,:features]
+task :default => [:test,"test:integration"]
 <% end %>