<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>rails_generators/shoulda_scaffold/templates/functional_test/basic.rb</filename>
    </added>
    <added>
      <filename>rails_generators/shoulda_scaffold/templates/functional_test/should_be_restful.rb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,4 +1,3 @@
-Manifest.txt
 rails_generators/shoulda_model/shoulda_model_generator.rb
 rails_generators/shoulda_model/templates/factory.rb
 rails_generators/shoulda_model/templates/fixtures.yml
@@ -17,7 +16,8 @@ rails_generators/shoulda_scaffold/templates/erb/index.html.erb
 rails_generators/shoulda_scaffold/templates/erb/layout.html.erb
 rails_generators/shoulda_scaffold/templates/erb/new.html.erb
 rails_generators/shoulda_scaffold/templates/erb/show.html.erb
-rails_generators/shoulda_scaffold/templates/functional_test.rb
+rails_generators/shoulda_scaffold/templates/functional_test/basic.rb
+rails_generators/shoulda_scaffold/templates/functional_test/should_be_restful.rb
 rails_generators/shoulda_scaffold/templates/haml/_form.html.haml
 rails_generators/shoulda_scaffold/templates/haml/edit.html.haml
 rails_generators/shoulda_scaffold/templates/haml/index.html.haml</diff>
      <filename>Manifest</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,5 @@
 class ShouldaScaffoldGenerator &lt; Rails::Generator::NamedBase
-  default_options :skip_timestamps =&gt; false, :skip_migration =&gt; false, :skip_layout =&gt; true, :templating =&gt; 'haml'
+  default_options :skip_timestamps =&gt; false, :skip_migration =&gt; false, :skip_layout =&gt; true, :templating =&gt; 'haml', :functional_test_style =&gt; 'should_be_restful'
 
   attr_reader   :controller_name,
                 :controller_class_path,
@@ -63,7 +63,7 @@ class ShouldaScaffoldGenerator &lt; Rails::Generator::NamedBase
         'controller.rb', File.join('app/controllers', controller_class_path, &quot;#{controller_file_name}_controller.rb&quot;)
       )
 
-      m.template('functional_test.rb', File.join('test/functional', controller_class_path, &quot;#{controller_file_name}_controller_test.rb&quot;))
+      m.template(&quot;functional_test/#{functional_test_style}.rb&quot;, File.join('test/functional', controller_class_path, &quot;#{controller_file_name}_controller_test.rb&quot;))
       m.template('helper.rb',          File.join('app/helpers',     controller_class_path, &quot;#{controller_file_name}_helper.rb&quot;))
 
       m.route_resources controller_file_name
@@ -76,6 +76,10 @@ class ShouldaScaffoldGenerator &lt; Rails::Generator::NamedBase
     options[:templating]
   end
 
+  def functional_test_style
+    options[:functional_test_style]
+  end
+
   protected
     # Override with your own usage banner.
     def banner
@@ -90,6 +94,7 @@ class ShouldaScaffoldGenerator &lt; Rails::Generator::NamedBase
       opt.on(&quot;--skip-migration&quot;,
              &quot;Don't generate a migration file for this model&quot;) { |v| options[:skip_migration] = v }
       opt.on(&quot;--templating [erb|haml]&quot;, &quot;Specify the templating to use (haml by default)&quot;) { |v| options[:templating] = v }
+      opt.on(&quot;--functional-test-style [basic|should_be_restful]&quot;, &quot;Specify the style of the functional test (should_be_restful by default)&quot;) { |v| options[:functional_test_style] = v }
     end
 
     def scaffold_views</diff>
      <filename>rails_generators/shoulda_scaffold/shoulda_scaffold_generator.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,15 +1,17 @@
-(in /Users/nichoj/Projects/shoulda_generator)
 Gem::Specification.new do |s|
   s.name = %q{shoulda_generator}
   s.version = &quot;0.1.0&quot;
 
-  s.required_rubygems_version = Gem::Requirement.new(&quot;&gt;= 0&quot;) if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(&quot;= 1.2&quot;) if s.respond_to? :required_rubygems_version=
   s.authors = [&quot;Josh Nichols&quot;]
   s.date = %q{2008-07-02}
+  s.description = %q{Generators which create tests using shoulda}
   s.email = %q{josh@technicalpickles.com}
+  s.extra_rdoc_files = [&quot;README.markdown&quot;]
+  s.files = [&quot;rails_generators/shoulda_model/shoulda_model_generator.rb&quot;, &quot;rails_generators/shoulda_model/templates/factory.rb&quot;, &quot;rails_generators/shoulda_model/templates/fixtures.yml&quot;, &quot;rails_generators/shoulda_model/templates/migration.rb&quot;, &quot;rails_generators/shoulda_model/templates/model.rb&quot;, &quot;rails_generators/shoulda_model/templates/unit_test.rb&quot;, &quot;rails_generators/shoulda_model/USAGE&quot;, &quot;rails_generators/shoulda_scaffold/shoulda_scaffold_generator.rb&quot;, &quot;rails_generators/shoulda_scaffold/templates/blueprint/ie.css&quot;, &quot;rails_generators/shoulda_scaffold/templates/blueprint/print.css&quot;, &quot;rails_generators/shoulda_scaffold/templates/blueprint/screen.css&quot;, &quot;rails_generators/shoulda_scaffold/templates/controller.rb&quot;, &quot;rails_generators/shoulda_scaffold/templates/erb/_form.html.erb&quot;, &quot;rails_generators/shoulda_scaffold/templates/erb/edit.html.erb&quot;, &quot;rails_generators/shoulda_scaffold/templates/erb/index.html.erb&quot;, &quot;rails_generators/shoulda_scaffold/templates/erb/layout.html.erb&quot;, &quot;rails_generators/shoulda_scaffold/templates/erb/new.html.erb&quot;, &quot;rails_generators/shoulda_scaffold/templates/erb/show.html.erb&quot;, &quot;rails_generators/shoulda_scaffold/templates/functional_test/basic.rb&quot;, &quot;rails_generators/shoulda_scaffold/templates/functional_test/should_be_restful.rb&quot;, &quot;rails_generators/shoulda_scaffold/templates/haml/_form.html.haml&quot;, &quot;rails_generators/shoulda_scaffold/templates/haml/edit.html.haml&quot;, &quot;rails_generators/shoulda_scaffold/templates/haml/index.html.haml&quot;, &quot;rails_generators/shoulda_scaffold/templates/haml/layout.html.haml&quot;, &quot;rails_generators/shoulda_scaffold/templates/haml/new.html.haml&quot;, &quot;rails_generators/shoulda_scaffold/templates/haml/show.html.haml&quot;, &quot;rails_generators/shoulda_scaffold/templates/helper.rb&quot;, &quot;rails_generators/shoulda_scaffold/USAGE&quot;, &quot;Rakefile&quot;, &quot;README.markdown&quot;, &quot;shoulda_generator.gemspec&quot;, &quot;Manifest&quot;]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/technicalpickles/shoulda_generator}
-  s.rdoc_options = [&quot;--main&quot;, &quot;README.txt&quot;]
+  s.rdoc_options = [&quot;--line-numbers&quot;, &quot;--inline-source&quot;, &quot;--title&quot;, &quot;Shoulda_generator&quot;, &quot;--main&quot;, &quot;README.markdown&quot;]
   s.require_paths = [&quot;lib&quot;]
   s.rubyforge_project = %q{shoulda_generator}
   s.rubygems_version = %q{1.2.0}
@@ -20,11 +22,11 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if current_version &gt;= 3 then
-      s.add_development_dependency(%q&lt;hoe&gt;, [&quot;&gt;= 1.7.0&quot;])
+      s.add_development_dependency(%q&lt;echoe&gt;, [&quot;&gt;= 0&quot;])
     else
-      s.add_dependency(%q&lt;hoe&gt;, [&quot;&gt;= 1.7.0&quot;])
+      s.add_dependency(%q&lt;echoe&gt;, [&quot;&gt;= 0&quot;])
     end
   else
-    s.add_dependency(%q&lt;hoe&gt;, [&quot;&gt;= 1.7.0&quot;])
+    s.add_dependency(%q&lt;echoe&gt;, [&quot;&gt;= 0&quot;])
   end
 end</diff>
      <filename>shoulda_generator.gemspec</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>rails_generators/shoulda_scaffold/templates/functional_test.rb</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>a2b67dec909003de1112af37d5440b85073c1bb0</id>
    </parent>
  </parents>
  <author>
    <name>Josh Nichols</name>
    <email>josh@technicalpickles.com</email>
  </author>
  <url>http://github.com/technicalpickles/shoulda_generator/commit/d92e98b8820fd3304aea59f4d66a3ec294e6960e</url>
  <id>d92e98b8820fd3304aea59f4d66a3ec294e6960e</id>
  <committed-date>2008-07-02T15:49:06-07:00</committed-date>
  <authored-date>2008-07-02T15:49:06-07:00</authored-date>
  <message>Supports should_be_restful now, with choice of a more 'basic' functional test.</message>
  <tree>c70e084d2e0a8a0df27c3e1e27ca92bde3ce74c2</tree>
  <committer>
    <name>Josh Nichols</name>
    <email>josh@technicalpickles.com</email>
  </committer>
</commit>
