<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -20,26 +20,45 @@ end
 require 'rake'
 require 'rake/rdoctask'
 require 'rake/testtask'
+require 'active_support'
 
 rspec_base = File.expand_path(RADIANT_ROOT + '/vendor/plugins/rspec/lib')
 $LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base)
 require 'spec/rake/spectask'
 # require 'spec/translator'
 
+$:.unshift(RAILS_ROOT + '/vendor/plugins/cucumber/lib')
+require 'cucumber/rake/task'
+
 # Cleanup the RADIANT_ROOT constant so specs will load the environment
 Object.send(:remove_const, :RADIANT_ROOT)
 
 extension_root = File.expand_path(File.dirname(__FILE__))
 
-task :default =&gt; [:spec, :features]
+task :default =&gt; :spec
 task :stats =&gt; &quot;spec:statsetup&quot;
 
 desc &quot;Run all specs in spec directory&quot;
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts = ['--options', &quot;\&quot;#{extension_root}/spec/spec.opts\&quot;&quot;]
-  t.spec_files = FileList['spec/**/*_spec.rb']
+task :spec do
+  errors = %w(spec:integration spec:models spec:controllers spec:views spec:helpers).collect do |task|
+    begin
+      puts %{\nRunning #{task.gsub('spec:', '').titlecase} Spec Task}
+      Rake::Task[task].invoke
+      nil
+    rescue =&gt; e
+      task
+    # ensure
+    #   if task == 'spec:integration'
+    #     Rake::Task[&quot;db:test:load&quot;].reenable
+    #     Rake::Task[&quot;db:schema:load&quot;].reenable
+    #     Rake::Task[&quot;db:test:prepare&quot;].execute
+    #   end
+    end
+  end.compact
+  abort &quot;Errors running #{errors.to_sentence}!&quot; if errors.any?
 end
 
+
 namespace :spec do
   desc &quot;Run all specs in spec directory with RCov&quot;
   Spec::Rake::SpecTask.new(:rcov) do |t|
@@ -62,14 +81,10 @@ namespace :spec do
       t.spec_files = FileList[&quot;spec/#{sub}/**/*_spec.rb&quot;]
     end
   end
-  
-  # Hopefully no one has written their extensions in pre-0.9 style
-  # desc &quot;Translate specs from pre-0.9 to 0.9 style&quot;
-  # task :translate do
-  #   translator = ::Spec::Translator.new
-  #   dir = RAILS_ROOT + '/spec'
-  #   translator.translate(dir, dir)
-  # end
+
+  Cucumber::Rake::Task.new(:integration) do |t|
+    t.cucumber_opts = &quot;--format progress&quot;
+  end
 
   # Setup specs for stats
   task :statsetup do
@@ -99,11 +114,6 @@ namespace :spec do
   end
 end
 
-require 'cucumber/rake/task'
-Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = &quot;--format pretty&quot; # Any valid command line option can go here.
-end
-
 desc 'Generate documentation for the chronicle extension.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -113,13 +123,5 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-# For extensions that are in transition
-desc 'Test the chronicle extension.'
-Rake::TestTask.new(:test) do |t|
-  t.libs &lt;&lt; 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
 # Load any custom rakefiles for extension
 Dir[File.dirname(__FILE__) + '/tasks/*.rake'].sort.each { |f| require f }
\ No newline at end of file</diff>
      <filename>Rakefile</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>lib/tasks/cucumber.rake</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>0c853b007971e3284dc0b62e90d66491a00fc65f</id>
    </parent>
  </parents>
  <author>
    <name>Jason Garber</name>
    <email>jg@jasongarber.com</email>
  </author>
  <url>http://github.com/jgarber/radiant-chronicle-extension/commit/d2fcc5178aa6191ca458f30301ff6ed1a0c05eca</url>
  <id>d2fcc5178aa6191ca458f30301ff6ed1a0c05eca</id>
  <committed-date>2009-06-30T09:11:00-07:00</committed-date>
  <authored-date>2009-06-30T09:11:00-07:00</authored-date>
  <message>Merge Cucumber features task into spec suite as integration test.</message>
  <tree>7a9a11c3c6a1e337781299cc25c29241b6089042</tree>
  <committer>
    <name>Jason Garber</name>
    <email>jg@jasongarber.com</email>
  </committer>
</commit>
