rm -rf rails_generator/generators

10 files changed, 113 insertions, 756 deletions

diff --git a/railties/test/generators/named_base_test.rb b/railties/test/generators/named_base_test.rb
new file mode 100644
index 0000000000..3a5c58ab32
--- /dev/null
+++ b/railties/test/generators/named_base_test.rb
@@ -0,0 +1,42 @@
+require 'abstract_unit'
+require 'generators/generators_test_helper'
+require 'generators/rails/scaffold_controller/scaffold_controller_generator'
+
+# Mock out what we need from AR::Base.
+module ActiveRecord
+  class Base
+    class << self
+      attr_accessor :pluralize_table_names
+    end
+    self.pluralize_table_names = true
+  end
+end
+
+class NamedBaseTest < GeneratorsTestCase
+
+  def test_named_generator_attributes
+    g = Rails::Generators::ScaffoldControllerGenerator.new ["admin/foo"]
+    assert_equal 'admin/foo', g.name
+    assert_equal %w(admin), g.class_path
+    assert_equal 1, g.class_nesting_depth
+    assert_equal 'Admin::Foo', g.class_name
+    assert_equal 'foo', g.singular_name
+    assert_equal 'foos', g.plural_name
+    assert_equal g.singular_name, g.file_name
+    assert_equal "admin_#{g.plural_name}", g.table_name
+  end
+
+  def test_named_generator_attributes_without_pluralized
+    ActiveRecord::Base.pluralize_table_names = false
+    g = Rails::Generators::ScaffoldControllerGenerator.new ["admin/foo"]
+    assert_equal "admin_#{g.singular_name}", g.table_name
+  end
+
+  def test_scaffold_plural_names
+    g = Rails::Generators::ScaffoldControllerGenerator.new ["ProductLine"]
+    assert_equal "ProductLines", g.controller_name
+    assert_equal "ProductLines", g.controller_class_name
+    assert_equal "product_lines", g.controller_file_name
+  end
+
+end
diff --git a/railties/test/rails_generator/generator_test_helper.rb b/railties/test/rails_generator/generator_test_helper.rb
deleted file mode 100644
index 01bf1c90bd..0000000000
--- a/railties/test/rails_generator/generator_test_helper.rb
+++ /dev/null
@@ -1,303 +0,0 @@
-require 'test/unit'
-require 'fileutils'
-
-# Mock out what we need from AR::Base
-module ActiveRecord
-  class Base
-    class << self
-      attr_accessor :pluralize_table_names, :timestamped_migrations
-    end
-    self.pluralize_table_names = true
-    self.timestamped_migrations = true
-  end
-
-  module ConnectionAdapters
-    class Column
-      attr_reader :name, :default, :type, :limit, :null, :sql_type, :precision, :scale
-
-      def initialize(name, default, sql_type = nil)
-        @name = name
-        @default = default
-        @type = @sql_type = sql_type
-      end
-
-      def human_name
-        @name.humanize
-      end
-    end
-  end
-end
-
-# Mock up necessities from ActionView
-module ActionView
-  module Helpers
-    module ActionRecordHelper; end
-    class InstanceTag; end
-  end
-end
-
-# Set RAILS_ROOT appropriately fixture generation
-tmp_dir = "#{File.dirname(__FILE__)}/../fixtures/tmp"
-
-if defined? RAILS_ROOT
-  RAILS_ROOT.replace tmp_dir
-else
-  RAILS_ROOT = tmp_dir
-end
-FileUtils.mkdir_p RAILS_ROOT
-
-$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../lib"
-require 'initializer'
-
-# Mocks out the configuration
-module Rails
-  def self.configuration
-    Rails::Configuration.new
-  end
-end
-
-require 'rails_generator'
-
-class GeneratorTestCase < Test::Unit::TestCase
-  include FileUtils
-
-  def setup
-    ActiveRecord::Base.pluralize_table_names = true
-
-    mkdir_p "#{RAILS_ROOT}/app/views/layouts"
-    mkdir_p "#{RAILS_ROOT}/config"
-    mkdir_p "#{RAILS_ROOT}/db"
-    mkdir_p "#{RAILS_ROOT}/test/fixtures"
-    mkdir_p "#{RAILS_ROOT}/public/stylesheets"
-
-    File.open("#{RAILS_ROOT}/config/routes.rb", 'w') do |f|
-      f << "ActionController::Routing::Routes.draw do |map|\n\nend"
-    end
-  end
-
-  def teardown
-    rm_rf "#{RAILS_ROOT}/app"
-    rm_rf "#{RAILS_ROOT}/test"
-    rm_rf "#{RAILS_ROOT}/config"
-    rm_rf "#{RAILS_ROOT}/db"
-    rm_rf "#{RAILS_ROOT}/public"
-  end
-
-  def test_truth
-    # don't complain, test/unit
-  end
-
-  # Instantiates the Generator.
-  def build_generator(name, params)
-    Rails::Generator::Base.instance(name, params)
-  end
-
-  # Runs the +create+ command (like the command line does).
-  def run_generator(name, params)
-    silence_generator do
-      build_generator(name, params).command(:create).invoke!
-    end
-  end
-
-  # Silences the logger temporarily and returns the output as a String.
-  def silence_generator
-    logger_original = Rails::Generator::Base.logger
-    myout = StringIO.new
-    Rails::Generator::Base.logger = Rails::Generator::SimpleLogger.new(myout)
-    yield if block_given?
-    Rails::Generator::Base.logger = logger_original
-    myout.string
-  end
-
-  # Asserts that the given controller was generated.
-  # It takes a name or symbol without the <tt>_controller</tt> part and an optional super class.
-  # The contents of the class source file is passed to a block.
-  def assert_generated_controller_for(name, parent = "ApplicationController")
-    assert_generated_class "app/controllers/#{name.to_s.underscore}_controller", parent do |body|
-      yield body if block_given?
-    end
-  end
-
-  # Asserts that the given model was generated.
-  # It takes a name or symbol and an optional super class.
-  # The contents of the class source file is passed to a block.
-  def assert_generated_model_for(name, parent = "ActiveRecord::Base")
-    assert_generated_class "app/models/#{name.to_s.underscore}", parent do |body|
-      yield body if block_given?
-    end
-  end
-
-  # Asserts that the given helper was generated.
-  # It takes a name or symbol without the <tt>_helper</tt> part.
-  # The contents of the module source file is passed to a block.
-  def assert_generated_helper_for(name)
-    assert_generated_module "app/helpers/#{name.to_s.underscore}_helper" do |body|
-      yield body if block_given?
-    end
-  end
-
-  # Asserts that the given functional test was generated.
-  # It takes a name or symbol without the <tt>_controller_test</tt> part and an optional super class.
-  # The contents of the class source file is passed to a block.
-  def assert_generated_functional_test_for(name, parent = "ActionController::TestCase")
-    assert_generated_class "test/functional/#{name.to_s.underscore}_controller_test",parent do |body|
-      yield body if block_given?
-    end
-  end
-
-  # Asserts that the given helper test test was generated.
-  # It takes a name or symbol without the <tt>_helper_test</tt> part and an optional super class.
-  # The contents of the class source file is passed to a block.
-  def assert_generated_helper_test_for(name, parent = "ActionView::TestCase")
-    path = "test/unit/helpers/#{name.to_s.underscore}_helper_test"
-    # Have to pass the path without the "test/" part so that class_name_from_path will return a correct result
-    class_name = class_name_from_path(path.gsub(/^test\//, ''))
-
-    assert_generated_class path,parent,class_name do |body|
-      yield body if block_given?
-    end
-  end
-
-  # Asserts that the given unit test was generated.
-  # It takes a name or symbol without the <tt>_test</tt> part and an optional super class.
-  # The contents of the class source file is passed to a block.
-  def assert_generated_unit_test_for(name, parent = "ActiveSupport::TestCase")
-    assert_generated_class "test/unit/#{name.to_s.underscore}_test", parent do |body|
-      yield body if block_given?
-    end
-  end
-
-  # Asserts that the given file was generated.
-  # The contents of the file is passed to a block.
-  def assert_generated_file(path)
-    assert_file_exists(path)
-    File.open("#{RAILS_ROOT}/#{path}") do |f|
-      yield f.read if block_given?
-    end
-  end
-
-  # asserts that the given file exists
-  def assert_file_exists(path)
-    assert File.exist?("#{RAILS_ROOT}/#{path}"),
-      "The file '#{RAILS_ROOT}/#{path}' should exist"
-  end
-
-  # Asserts that the given class source file was generated.
-  # It takes a path without the <tt>.rb</tt> part and an optional super class.
-  # The contents of the class source file is passed to a block.
-  def assert_generated_class(path, parent = nil, class_name = class_name_from_path(path))
-    assert_generated_file("#{path}.rb") do |body|
-      assert_match /class #{class_name}#{parent.nil? ? '':" < #{parent}"}/, body, "the file '#{path}.rb' should be a class"
-      yield body if block_given?
-    end
-  end
-
-  def class_name_from_path(path)
-    # FIXME: Sucky way to detect namespaced classes
-    if path.split('/').size > 3
-      path =~ /\/?(\d+_)?(\w+)\/(\w+)$/
-      "#{$2.camelize}::#{$3.camelize}"
-    else
-      path =~ /\/?(\d+_)?(\w+)$/
-      $2.camelize
-    end
-  end
-
-  # Asserts that the given module source file was generated.
-  # It takes a path without the <tt>.rb</tt> part.
-  # The contents of the class source file is passed to a block.
-  def assert_generated_module(path)
-    # FIXME: Sucky way to detect namespaced modules
-    if path.split('/').size > 3
-      path =~ /\/?(\w+)\/(\w+)$/
-      module_name = "#{$1.camelize}::#{$2.camelize}"
-    else
-      path =~ /\/?(\w+)$/
-      module_name = $1.camelize
-    end
-
-    assert_generated_file("#{path}.rb") do |body|
-      assert_match /module #{module_name}/, body, "the file '#{path}.rb' should be a module"
-      yield body if block_given?
-    end
-  end
-
-  # Asserts that the given CSS stylesheet file was generated.
-  # It takes a path without the <tt>.css</tt> part.
-  # The contents of the stylesheet source file is passed to a block.
-  def assert_generated_stylesheet(path)
-    assert_generated_file("public/stylesheets/#{path}.css") do |body|
-      yield body if block_given?
-    end
-  end
-
-  # Asserts that the given YAML file was generated.
-  # It takes a path without the <tt>.yml</tt> part.
-  # The parsed YAML tree is passed to a block.
-  def assert_generated_yaml(path)
-    assert_generated_file("#{path}.yml") do |body|
-      yaml = YAML.load(body)
-      assert yaml, 'YAML data missing'
-      yield yaml if block_given?
-    end
-  end
-
-  # Asserts that the given fixtures YAML file was generated.
-  # It takes a fixture name without the <tt>.yml</tt> part.
-  # The parsed YAML tree is passed to a block.
-  def assert_generated_fixtures_for(name)
-    assert_generated_yaml "test/fixtures/#{name.to_s.underscore}" do |yaml|
-      yield yaml if block_given?
-    end
-  end
-
-  # Asserts that the given views were generated.
-  # It takes a controller name and a list of views (including extensions).
-  # The body of each view is passed to a block.
-  def assert_generated_views_for(name, *actions)
-    actions.each do |action|
-      assert_generated_file("app/views/#{name.to_s.underscore}/#{action}") do |body|
-        yield body if block_given?
-      end
-    end
-  end
-
-  def assert_generated_migration(name, parent = "ActiveRecord::Migration")
-    file = Dir.glob("#{RAILS_ROOT}/db/migrate/*_#{name.to_s.underscore}.rb").first
-    file = file.match(/db\/migrate\/[0-9]+_\w+/).to_s
-    assert_generated_class file, parent do |body|
-      assert_match /timestamps/, body, "should have timestamps defined"
-      yield body if block_given?
-    end
-  end
-
-  # Asserts that the given migration file was not generated.
-  # It takes the name of the migration as a parameter.
-  def assert_skipped_migration(name)
-    migration_file = "#{RAILS_ROOT}/db/migrate/001_#{name.to_s.underscore}.rb"
-    assert !File.exist?(migration_file), "should not create migration #{migration_file}"
-  end
-
-  # Asserts that the given resource was added to the routes.
-  def assert_added_route_for(name)
-    assert_generated_file("config/routes.rb") do |body|
-      assert_match /map.resources :#{name.to_s.underscore}/, body,
-        "should add route for :#{name.to_s.underscore}"
-    end
-  end
-
-  # Asserts that the given methods are defined in the body.
-  # This does assume standard rails code conventions with regards to the source code.
-  # The body of each individual method is passed to a block.
-  def assert_has_method(body, *methods)
-    methods.each do |name|
-      assert body =~ /^  def #{name}(\(.+\))?\n((\n|   .*\n)*)  end/, "should have method #{name}"
-      yield(name, $2) if block_given?
-    end
-  end
-
-  # Asserts that the given column is defined in the migration.
-  def assert_generated_column(body, name, type)
-    assert_match /t\.#{type.to_s} :#{name.to_s}/, body, "should have column #{name.to_s} defined"
-  end
-end
diff --git a/railties/test/rails_generator/rails_controller_generator_test.rb b/railties/test/rails_generator/rails_controller_generator_test.rb
deleted file mode 100644
index 6cbb6bf2bd..0000000000
--- a/railties/test/rails_generator/rails_controller_generator_test.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-require 'rails_generator/generator_test_helper'
-
-module Admin
-end
-
-class RailsControllerGeneratorTest < GeneratorTestCase
-
-  def test_controller_generates_controller
-    run_generator('controller', %w(products))
-
-    assert_generated_controller_for :products
-    assert_generated_functional_test_for :products
-    assert_generated_helper_for :products
-    assert_generated_helper_test_for :products
-  end
-
-  def test_controller_generates_namespaced_controller
-    run_generator('controller', %w(admin::products))
-
-    assert_generated_controller_for "admin::products"
-    assert_generated_functional_test_for "admin::products"
-    assert_generated_helper_for "admin::products"
-    assert_generated_helper_test_for "admin::products"
-  end
-
-  def test_controller_generates_namespaced_and_not_namespaced_controllers
-    run_generator('controller', %w(products))
-
-    # We have to require the generated helper to show the problem because
-    # the test helpers just check for generated files and contents but
-    # do not actually load them. But they have to be loaded (as in a real environment)
-    # to make the second generator run fail
-    require "#{RAILS_ROOT}/app/helpers/products_helper"
-
-    assert_nothing_raised do
-      begin
-        run_generator('controller', %w(admin::products))
-      ensure
-        # cleanup
-        Object.send(:remove_const, :ProductsHelper)
-      end
-    end
-  end
-end
diff --git a/railties/test/rails_generator/rails_helper_generator_test.rb b/railties/test/rails_generator/rails_helper_generator_test.rb
deleted file mode 100644
index 8d05f555e6..0000000000
--- a/railties/test/rails_generator/rails_helper_generator_test.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require File.dirname(__FILE__) + '/generator_test_helper'
-
-class RailsHelperGeneratorTest < GeneratorTestCase
-  def test_helper_generates_helper
-    run_generator('helper', %w(products))
-
-    assert_generated_helper_for :products
-    assert_generated_helper_test_for :products
-  end
-
-  def test_helper_generates_namespaced_helper
-    run_generator('helper', %w(admin::products))
-
-    assert_generated_helper_for "admin::products"
-    assert_generated_helper_test_for "admin::products"
-  end
-
-  def test_helper_generates_namespaced_and_not_namespaced_helpers
-    run_generator('helper', %w(products))
-
-    # We have to require the generated helper to show the problem because
-    # the test helpers just check for generated files and contents but
-    # do not actually load them. But they have to be loaded (as in a real environment)
-    # to make the second generator run fail
-    require "#{RAILS_ROOT}/app/helpers/products_helper"
-
-    assert_nothing_raised do
-      begin
-        run_generator('helper', %w(admin::products))
-      ensure
-        # cleanup
-        Object.send(:remove_const, :ProductsHelper)
-      end
-    end
-  end
-end
diff --git a/railties/test/rails_generator/rails_mailer_generator_test.rb b/railties/test/rails_generator/rails_mailer_generator_test.rb
deleted file mode 100644
index f580fe27ab..0000000000
--- a/railties/test/rails_generator/rails_mailer_generator_test.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'rails_generator/generator_test_helper'
-
-class RailsMailerGeneratorTest < GeneratorTestCase
-
-  def test_generates_mailer
-    run_generator('mailer', %w(Notifier reset_password))
-
-    assert_generated_model_for :notifier, 'ActionMailer::Base' do |model|
-      assert_has_method model, :reset_password do |name, body|
-        assert_equal [
-            "subject    'Notifier#reset_password'",
-            "recipients ''",
-            "from       ''",
-            "sent_on    sent_at",
-            "",
-            "body       :greeting => 'Hi,'"
-          ],
-          body.split("\n").map{|line| line.sub(' '*4, '') }
-      end
-      
-      assert_no_match /(self.default_url_options =|default_url_options\[.*\] =)/, model,
-        'individual mailer models should not set default_url_options because the options are shared by all mailers'
-    end
-    
-    assert_generated_views_for :notifier, 'reset_password.erb'
-    assert_generated_unit_test_for :notifier, 'ActionMailer::TestCase'
-    assert_generated_file "test/fixtures/notifier/reset_password"
-  end
-end
diff --git a/railties/test/rails_generator/rails_model_generator_test.rb b/railties/test/rails_generator/rails_model_generator_test.rb
deleted file mode 100644
index ae3c2e316e..0000000000
--- a/railties/test/rails_generator/rails_model_generator_test.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-require 'rails_generator/generator_test_helper'
-
-class RailsModelGeneratorTest < GeneratorTestCase
-
-  def test_model_generates_resources
-    run_generator('model', %w(Product name:string))
-
-    assert_generated_model_for :product
-    assert_generated_fixtures_for :products
-    assert_generated_migration :create_products
-  end
-
-  def test_model_skip_migration_skips_migration
-    run_generator('model', %w(Product name:string --skip-migration))
-
-    assert_generated_model_for :product
-    assert_generated_fixtures_for :products
-    assert_skipped_migration :create_products
-  end
-
-  def test_model_with_attributes_generates_resources_with_attributes
-    run_generator('model', %w(Product name:string supplier_id:integer created_at:timestamp))
-
-    assert_generated_model_for :product
-    assert_generated_fixtures_for :products
-    assert_generated_migration :create_products do |t|
-      assert_generated_column t, :name, :string
-      assert_generated_column t, :supplier_id, :integer
-      assert_generated_column t, :created_at, :timestamp
-    end
-  end
-
-  def test_model_with_reference_attributes_generates_belongs_to_associations
-    run_generator('model', %w(Product name:string supplier:references))
-
-    assert_generated_model_for :product do |body|
-      assert body =~ /^\s+belongs_to :supplier/, "#{body.inspect} should contain 'belongs_to :supplier'"
-    end
-  end
-
-  def test_model_with_belongs_to_attributes_generates_belongs_to_associations
-    run_generator('model', %w(Product name:string supplier:belongs_to))
-
-    assert_generated_model_for :product do |body|
-      assert body =~ /^\s+belongs_to :supplier/, "#{body.inspect} should contain 'belongs_to :supplier'"
-    end
-  end
-end
diff --git a/railties/test/rails_generator/rails_model_subclass_generator_test.rb b/railties/test/rails_generator/rails_model_subclass_generator_test.rb
deleted file mode 100644
index 4f20de6eba..0000000000
--- a/railties/test/rails_generator/rails_model_subclass_generator_test.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'rails_generator/generator_test_helper'
-
-class RailsModelSubclassGeneratorTest < GeneratorTestCase
-
-  def test_model_subclass_generates_resources
-    run_generator('model_subclass', %w(Car Product))
-
-    assert_generated_model_for :car, "Product"
-    assert_generated_unit_test_for :car
-  end
-
-  def test_model_subclass_must_have_a_parent_class_name
-    assert_raise(Rails::Generator::UsageError) { run_generator('model_subclass', %w(Car)) }
-  end
-end
diff --git a/railties/test/rails_generator/rails_resource_generator_test.rb b/railties/test/rails_generator/rails_resource_generator_test.rb
deleted file mode 100644
index b9a432cbff..0000000000
--- a/railties/test/rails_generator/rails_resource_generator_test.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'rails_generator/generator_test_helper'
-
-class RailsResourceGeneratorTest < GeneratorTestCase
-  def test_resource_generates_resources
-    run_generator('resource', %w(Product name:string))
-
-    assert_generated_controller_for :products
-    assert_generated_model_for :product
-    assert_generated_fixtures_for :products
-    assert_generated_functional_test_for :products
-    assert_generated_helper_for :products
-    assert_generated_helper_test_for :products
-    assert_generated_migration :create_products
-    assert_added_route_for :products
-  end
-
-  def test_resource_skip_migration_skips_migration
-    run_generator('resource', %w(Product name:string --skip-migration))
-
-    assert_generated_controller_for :products
-    assert_generated_model_for :product
-    assert_generated_fixtures_for :products
-    assert_generated_functional_test_for :products
-    assert_generated_helper_for :products
-    assert_generated_helper_test_for :products
-    assert_skipped_migration :create_products
-    assert_added_route_for :products
-  end
-end
diff --git a/railties/test/rails_generator/rails_scaffold_generator_test.rb b/railties/test/rails_generator/rails_scaffold_generator_test.rb
deleted file mode 100644
index ffbeff79fb..0000000000
--- a/railties/test/rails_generator/rails_scaffold_generator_test.rb
+++ /dev/null
@@ -1,150 +0,0 @@
-require 'rails_generator/generator_test_helper'
-require 'abstract_unit'
-
-class RailsScaffoldGeneratorTest < GeneratorTestCase
-  def test_scaffolded_names
-    g = Rails::Generator::Base.instance('scaffold', %w(ProductLine))
-    assert_equal "ProductLines", g.controller_name
-    assert_equal "ProductLines", g.controller_class_name
-    assert_equal "ProductLine", g.controller_singular_name
-    assert_equal "product_lines", g.controller_plural_name
-    assert_equal "product_lines", g.controller_file_name
-    assert_equal "product_lines", g.controller_table_name
-  end
-
-  def test_scaffold_generates_resources
-
-    run_generator('scaffold', %w(Product name:string))
-
-    assert_generated_controller_for :products do |f|
-
-      assert_has_method f, :index do |name, m|
-        assert_match /@products = Product\.all/, m, "#{name} should query products table"
-      end
-
-      assert_has_method f, :show, :edit, :update, :destroy do |name, m|
-        assert_match /@product = Product\.find\(params\[:id\]\)/, m, "#{name.to_s} should query products table"
-      end
-
-      assert_has_method f, :new do |name, m|
-        assert_match /@product = Product\.new/, m, "#{name.to_s} should instantiate a product"
-      end
-
-      assert_has_method f, :create do |name, m|
-        assert_match /@product = Product\.new\(params\[:product\]\)/, m, "#{name.to_s} should instantiate a product"
-        assert_match /format.xml  \{ render :xml => @product.errors, :status => :unprocessable_entity \}/, m, "#{name.to_s} should set status to :unprocessable_entity code for xml"
-      end
-
-    end
-
-    assert_generated_model_for :product
-    assert_generated_functional_test_for :products
-    assert_generated_unit_test_for :product
-    assert_generated_fixtures_for :products
-    assert_generated_helper_for :products
-    assert_generated_helper_test_for :products
-    assert_generated_stylesheet :scaffold
-    assert_generated_views_for :products, "index.html.erb", "new.html.erb", "edit.html.erb", "show.html.erb"
-
-    assert_generated_migration :create_products
-    assert_added_route_for :products
-  end
-
-  def test_scaffold_skip_migration_skips_migration
-    run_generator('scaffold', %w(Product name:string --skip-migration))
-
-    assert_generated_model_for :product
-    assert_generated_functional_test_for :products
-    assert_generated_unit_test_for :product
-    assert_generated_fixtures_for :products
-    assert_generated_helper_for :products
-    assert_generated_helper_test_for :products
-    assert_generated_stylesheet :scaffold
-    assert_generated_views_for :products, "index.html.erb","new.html.erb","edit.html.erb","show.html.erb"
-    assert_skipped_migration :create_products
-    assert_added_route_for :products
-  end
-
-  def test_scaffold_generates_resources_with_attributes
-    run_generator('scaffold', %w(Product name:string supplier_id:integer created_at:timestamp))
-
-    assert_generated_controller_for :products do |f|
-
-      assert_has_method f, :index do |name, m|
-        assert_match /@products = Product\.all/, m, "#{name} should query products table"
-      end
-
-      assert_has_method f, :show, :edit, :update, :destroy do |name, m|
-        assert_match /@product = Product\.find\(params\[:id\]\)/, m, "#{name.to_s} should query products table"
-      end
-
-      assert_has_method f, :new do |name, m|
-        assert_match /@product = Product\.new/, m, "#{name.to_s} should instantiate a product"
-      end
-
-      assert_has_method f, :create do |name, m|
-        assert_match /@product = Product\.new\(params\[:product\]\)/, m, "#{name.to_s} should instantiate a product"
-        assert_match /format.xml  \{ render :xml => @product.errors, :status => :unprocessable_entity \}/, m, "#{name.to_s} should set status to :unprocessable_entity code for xml"
-      end
-
-    end
-
-    assert_generated_model_for :product
-    assert_generated_functional_test_for :products
-    assert_generated_unit_test_for :product
-    assert_generated_fixtures_for :products
-    assert_generated_helper_for :products
-    assert_generated_helper_test_for :products
-    assert_generated_stylesheet :scaffold
-    assert_generated_views_for :products, "index.html.erb", "new.html.erb", "edit.html.erb", "show.html.erb"
-
-    assert_generated_migration :create_products do |t|
-      assert_generated_column t, :name, :string
-      assert_generated_column t, :supplier_id, :integer
-      assert_generated_column t, :created_at, :timestamp
-    end
-
-    assert_added_route_for :products
-  end
-
-  def test_scaffolded_plural_names
-    Rails::Generator::Base.logger.expects(:warning)
-    g = Rails::Generator::Base.instance('scaffold', %w(ProductLines))
-    assert_equal "ProductLines", g.controller_name
-    assert_equal "ProductLines", g.controller_class_name
-    assert_equal "ProductLine", g.controller_singular_name
-    assert_equal "product_lines", g.controller_plural_name
-    assert_equal "product_lines", g.controller_file_name
-    assert_equal "product_lines", g.controller_table_name
-  end
-
-  def test_scaffold_plural_model_name_without_force_plural_generates_singular_model
-    run_generator('scaffold', %w(Products name:string))
-
-    assert_generated_model_for :product
-    assert_generated_functional_test_for :products
-    assert_generated_unit_test_for :product
-    assert_generated_fixtures_for :products
-    assert_generated_helper_for :products
-    assert_generated_helper_test_for :products
-    assert_generated_stylesheet :scaffold
-    assert_generated_views_for :products, "index.html.erb","new.html.erb","edit.html.erb","show.html.erb"
-    assert_skipped_migration :create_products
-    assert_added_route_for :products
-  end
-
-  def test_scaffold_plural_model_name_with_force_plural_forces_plural_model
-    run_generator('scaffold', %w(Products name:string --force-plural))
-
-    assert_generated_model_for :products
-    assert_generated_functional_test_for :products
-    assert_generated_unit_test_for :products
-    assert_generated_fixtures_for :products
-    assert_generated_helper_for :products
-    assert_generated_helper_test_for :products
-    assert_generated_stylesheet :scaffold
-    assert_generated_views_for :products, "index.html.erb","new.html.erb","edit.html.erb","show.html.erb"
-    assert_skipped_migration :create_products
-    assert_added_route_for :products
-  end
-end
diff --git a/railties/test/rails_generator_test.rb b/railties/test/rails_generator_test.rb
index 38bd90dcc1..5a1409fc2e 100644
--- a/railties/test/rails_generator_test.rb
+++ b/railties/test/rails_generator_test.rb
@@ -44,105 +44,74 @@ end
 
 require 'rails_generator'
 
-class RailsGeneratorTest < Test::Unit::TestCase
-  BUILTINS = %w(controller integration_test mailer migration model observer plugin resource scaffold session_migration)
-  CAPITALIZED_BUILTINS = BUILTINS.map { |b| b.capitalize }
-
-  def setup
-    ActiveRecord::Base.pluralize_table_names = true
-    @initializer = Rails::Initializer.default
-    @initializer.config = Rails.configuration
-    @initializer.run(:set_root_path)
-  end
-
-  def test_sources
-    expected = [:lib, :vendor,
-                "plugins (vendor/plugins)".to_sym, # <plugin>/generators and <plugin>/rails_generators
-                :user,
-                :RubyGems, :RubyGems, # gems named <x>_generator, gems containing /rails_generator/ folder
-                :builtin]
-    expected.delete(:RubyGems) unless Object.const_defined?(:Gem)
-    assert_equal expected, Rails::Generator::Base.sources.map { |s| s.label }
-  end
-
-  def test_lookup_builtins
-    (BUILTINS + CAPITALIZED_BUILTINS).each do |name|
-      assert_nothing_raised do
-        spec = Rails::Generator::Base.lookup(name)
-        assert_not_nil spec
-        assert_kind_of Rails::Generator::Spec, spec
-
-        klass = spec.klass
-        assert klass < Rails::Generator::Base
-        assert_equal spec, klass.spec
-      end
-    end
-  end
-
-  def test_autolookup
-    assert_nothing_raised { ControllerGenerator }
-    assert_nothing_raised { ModelGenerator }
-  end
-
-  def test_lookup_missing_generator
-    assert_raise Rails::Generator::GeneratorError do
-      Rails::Generator::Base.lookup('missing').klass
-    end
-  end
-
-  def test_lookup_missing_class
-    spec = nil
-    assert_nothing_raised { spec = Rails::Generator::Base.lookup('missing_class') }
-    assert_not_nil spec
-    assert_kind_of Rails::Generator::Spec, spec
-    assert_raise(NameError) { spec.klass }
-  end
-
-  def test_generator_usage
-    (BUILTINS - ["session_migration"]).each do |name|
-      assert_raise(Rails::Generator::UsageError, "Generator '#{name}' should raise an error without arguments") {
-        Rails::Generator::Base.instance(name)
-      }
-    end
-  end
-
-  def test_generator_spec
-    spec = Rails::Generator::Base.lookup('working')
-    assert_equal 'working', spec.name
-    assert_match(/#{spec.path}$/, "#{RAILS_ROOT}/lib/generators/working")
-    assert_equal :lib, spec.source
-    assert_nothing_raised { assert_match(/WorkingGenerator$/, spec.klass.name) }
-  end
-
-  def test_named_generator_attributes
-    g = Rails::Generator::Base.instance('working', %w(admin/foo bar baz))
-    assert_equal 'admin/foo', g.name
-    assert_equal %w(admin), g.class_path
-    assert_equal 'Admin', g.class_nesting
-    assert_equal 'Admin::Foo', g.class_name
-    assert_equal 'foo', g.singular_name
-    assert_equal 'foos', g.plural_name
-    assert_equal g.singular_name, g.file_name
-    assert_equal "admin_#{g.plural_name}", g.table_name
-    assert_equal %w(bar baz), g.args
-  end
-
-  def test_named_generator_attributes_without_pluralized
-    ActiveRecord::Base.pluralize_table_names = false
-    g = Rails::Generator::Base.instance('working', %w(admin/foo bar baz))
-    assert_equal "admin_#{g.singular_name}", g.table_name
-  end
-
-  def test_session_migration_generator_with_pluralization
-    g = Rails::Generator::Base.instance('session_migration')
-    assert_equal 'session'.pluralize, g.send(:default_session_table_name)
-    ActiveRecord::Base.pluralize_table_names = false
-    assert_equal 'session', g.send(:default_session_table_name)
-  end
-
-  def test_scaffold_controller_name
-    # Default behaviour is use the model name
-    g = Rails::Generator::Base.instance('scaffold', %w(Product))
-    assert_equal "Products", g.controller_name
-  end
-end
+#class RailsGeneratorTest < Test::Unit::TestCase
+#  BUILTINS = %w(controller integration_test mailer migration model observer plugin resource scaffold session_migration)
+#  CAPITALIZED_BUILTINS = BUILTINS.map { |b| b.capitalize }
+
+#  def setup
+#    ActiveRecord::Base.pluralize_table_names = true
+#    @initializer = Rails::Initializer.default
+#    @initializer.config = Rails.configuration
+#    @initializer.run(:set_root_path)
+#  end
+
+#  def test_sources
+#    expected = [:lib, :vendor,
+#                "plugins (vendor/plugins)".to_sym, # <plugin>/generators and <plugin>/rails_generators
+#                :user,
+#                :RubyGems, :RubyGems, # gems named <x>_generator, gems containing /rails_generator/ folder
+#                :builtin]
+#    expected.delete(:RubyGems) unless Object.const_defined?(:Gem)
+#    assert_equal expected, Rails::Generator::Base.sources.map { |s| s.label }
+#  end
+
+#  def test_lookup_builtins
+#    (BUILTINS + CAPITALIZED_BUILTINS).each do |name|
+#      assert_nothing_raised do
+#        spec = Rails::Generator::Base.lookup(name)
+#        assert_not_nil spec
+#        assert_kind_of Rails::Generator::Spec, spec
+
+#        klass = spec.klass
+#        assert klass < Rails::Generator::Base
+#        assert_equal spec, klass.spec
+#      end
+#    end
+#  end
+
+#  def test_autolookup
+#    assert_nothing_raised { ControllerGenerator }
+#    assert_nothing_raised { ModelGenerator }
+#  end
+
+#  def test_lookup_missing_generator
+#    assert_raise Rails::Generator::GeneratorError do
+#      Rails::Generator::Base.lookup('missing').klass
+#    end
+#  end
+
+#  def test_lookup_missing_class
+#    spec = nil
+#    assert_nothing_raised { spec = Rails::Generator::Base.lookup('missing_class') }
+#    assert_not_nil spec
+#    assert_kind_of Rails::Generator::Spec, spec
+#    assert_raise(NameError) { spec.klass }
+#  end
+
+#  def test_generator_usage
+#    (BUILTINS - ["session_migration"]).each do |name|
+#      assert_raise(Rails::Generator::UsageError, "Generator '#{name}' should raise an error without arguments") {
+#        Rails::Generator::Base.instance(name)
+#      }
+#    end
+#  end
+
+#  def test_generator_spec
+#    spec = Rails::Generator::Base.lookup('working')
+#    assert_equal 'working', spec.name
+#    assert_match(/#{spec.path}$/, "#{RAILS_ROOT}/lib/generators/working")
+#    assert_equal :lib, spec.source
+#    assert_nothing_raised { assert_match(/WorkingGenerator$/, spec.klass.name) }
+#  end
+
+#end