<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -66,27 +66,23 @@ class ForgotPasswordGenerator &lt; Rails::Generator::NamedBase
                             &quot;#{controller_file_name}_controller.rb&quot;)
 
       if @rspec
-        m.template 'functional_spec.rb',
+        m.template 'rspec_controller:controller_spec.rb',
                     File.join('spec/controllers',
                               controller_class_path,
                               &quot;#{controller_file_name}_controller_spec.rb&quot;)
-        m.template 'model_functional_spec.rb',
-                    File.join('spec/controllers',
-                              model_controller_class_path,
-                              &quot;#{model_controller_file_name}_controller_spec.rb&quot;)
-        m.template 'unit_spec.rb',
+        m.template 'rspec_model:model_spec.rb',
                     File.join('spec/models',
                               class_path,
                               &quot;#{file_name}_spec.rb&quot;)
-        m.template 'fixtures.yml',
+        m.template 'model:fixtures.yml',
                     File.join('spec/fixtures',
                               &quot;#{table_name}.yml&quot;)
       end
 
       m.template 'helper.rb',
                   File.join('app/helpers',
-                            controller_class_path,
-                            &quot;#{controller_file_name}_helper.rb&quot;)
+                          controller_class_path,
+                          &quot;#{controller_file_name}_helper.rb&quot;)
 
       # Controller templates
       m.template 'new.html.erb',  File.join('app/views', controller_class_path, controller_file_name, &quot;new.html.erb&quot;)</diff>
      <filename>generators/forgot_password/forgot_password_generator.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>67ca556afa3bb432cbbf85f2d233a99ed36e146d</id>
    </parent>
    <parent>
      <id>2b701983ee2c85c68d572d6a6e2cf7e8c979ab3e</id>
    </parent>
  </parents>
  <author>
    <name>Michael Mayo</name>
    <email>greenisus@gmail.com</email>
  </author>
  <url>http://github.com/greenisus/forgot_password/commit/e9c2d5838e173d6be251f95923ca00819a1d3464</url>
  <id>e9c2d5838e173d6be251f95923ca00819a1d3464</id>
  <committed-date>2008-11-03T19:45:37-08:00</committed-date>
  <authored-date>2008-11-03T19:45:37-08:00</authored-date>
  <message>Merge branch 'master' of git://github.com/ajsharp/forgot_password into ajsharp/master</message>
  <tree>0f94ce615d9ebdb09ac4e737b3e3fe68c8274685</tree>
  <committer>
    <name>Michael Mayo</name>
    <email>greenisus@gmail.com</email>
  </committer>
</commit>
