<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,15 +1,15 @@
-desc 'Run unit tests'
-Rake::TestTask.new('test_unit') do |t|
-  t.libs &lt;&lt; 'test'
-  t.pattern = 'test/unit/*_test.rb'
-  t.verbose = true
-end
+namespace(:test) do
+  Rake::TestTask.new('models') do |t|
+    t.libs &lt;&lt; 'test'
+    t.pattern = 'test/models/*_test.rb'
+    t.verbose = true
+  end
 
-desc 'Run functional tests'
-Rake::TestTask.new('test_functional') do |t|
-  t.libs &lt;&lt; 'test'
-  t.pattern = 'test/functional/*_test.rb'
-  t.verbose = true
+  Rake::TestTask.new('controllers') do |t|
+    t.libs &lt;&lt; 'test'
+    t.pattern = 'test/controllers/*_test.rb'
+    t.verbose = true
+  end
 end
 
 desc 'Run all tests'</diff>
      <filename>merb_test_unit/lib/merb_test_unit/merbtasks.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>3a21c8e9ca33b924d710109f47a6bb1c139a62dd</id>
    </parent>
    <parent>
      <id>dd4d81aacd20c3e2ea5acaf38459c2d3a7fcd4ef</id>
    </parent>
  </parents>
  <author>
    <name>Michael S. Klishin</name>
    <email>michael@novemberain.com</email>
  </author>
  <url>http://github.com/wycats/merb-plugins/commit/9875d074a0fe98333928f7f793c35291ccecf1f0</url>
  <id>9875d074a0fe98333928f7f793c35291ccecf1f0</id>
  <committed-date>2008-10-21T07:40:53-07:00</committed-date>
  <authored-date>2008-10-21T07:40:53-07:00</authored-date>
  <message>Merge commit 'jdunphy/merb_test_unit-raketasks'

* commit 'jdunphy/merb_test_unit-raketasks':
  Switching to names consistent with what gets generated by merb-gen.</message>
  <tree>a6c791a9baa958f17e33bbfc96691080a5b1a1ae</tree>
  <committer>
    <name>Michael S. Klishin</name>
    <email>michael@novemberain.com</email>
  </committer>
</commit>
