Merge remote branch 'drogus/plugin_new'

Conflicts:
	railties/test/generators/app_generator_test.rb

15 files changed, 614 insertions, 167 deletions

diff --git a/railties/test/fixtures/lib/empty_builder.rb b/railties/test/fixtures/lib/app_builders/empty_builder.rb
index babd9c2461..babd9c2461 100644
--- a/railties/test/fixtures/lib/empty_builder.rb
+++ b/railties/test/fixtures/lib/app_builders/empty_builder.rb
diff --git a/railties/test/fixtures/lib/app_builders/simple_builder.rb b/railties/test/fixtures/lib/app_builders/simple_builder.rb
new file mode 100644
index 0000000000..993d3a2aa2
--- /dev/null
+++ b/railties/test/fixtures/lib/app_builders/simple_builder.rb
@@ -0,0 +1,7 @@
+class AppBuilder
+  def gitignore
+    create_file ".gitignore", <<-R.strip
+foobar
+    R
+  end
+end
diff --git a/railties/test/fixtures/lib/app_builders/tweak_builder.rb b/railties/test/fixtures/lib/app_builders/tweak_builder.rb
new file mode 100644
index 0000000000..cb50be01cb
--- /dev/null
+++ b/railties/test/fixtures/lib/app_builders/tweak_builder.rb
@@ -0,0 +1,7 @@
+class AppBuilder < Rails::AppBuilder
+  def gitignore
+    create_file ".gitignore", <<-R.strip
+foobar
+    R
+  end
+end
diff --git a/railties/test/fixtures/lib/create_test_dummy_template.rb b/railties/test/fixtures/lib/create_test_dummy_template.rb
new file mode 100644
index 0000000000..e4378bbd1a
--- /dev/null
+++ b/railties/test/fixtures/lib/create_test_dummy_template.rb
@@ -0,0 +1 @@
+create_dummy_app("spec/dummy")
diff --git a/railties/test/fixtures/lib/plugin_builders/empty_builder.rb b/railties/test/fixtures/lib/plugin_builders/empty_builder.rb
new file mode 100644
index 0000000000..5c5607621c
--- /dev/null
+++ b/railties/test/fixtures/lib/plugin_builders/empty_builder.rb
@@ -0,0 +1,2 @@
+class PluginBuilder
+end
diff --git a/railties/test/fixtures/lib/plugin_builders/simple_builder.rb b/railties/test/fixtures/lib/plugin_builders/simple_builder.rb
new file mode 100644
index 0000000000..08f6c5535d
--- /dev/null
+++ b/railties/test/fixtures/lib/plugin_builders/simple_builder.rb
@@ -0,0 +1,7 @@
+class PluginBuilder
+  def gitignore
+    create_file ".gitignore", <<-R.strip
+foobar
+    R
+  end
+end
diff --git a/railties/test/fixtures/lib/plugin_builders/spec_builder.rb b/railties/test/fixtures/lib/plugin_builders/spec_builder.rb
new file mode 100644
index 0000000000..aa18c7ddaa
--- /dev/null
+++ b/railties/test/fixtures/lib/plugin_builders/spec_builder.rb
@@ -0,0 +1,19 @@
+class PluginBuilder < Rails::PluginBuilder
+  def test
+    create_file "spec/spec_helper.rb"
+    append_file "Rakefile", <<-EOF
+# spec tasks in rakefile
+
+task :default => :spec
+    EOF
+  end
+
+  def generate_test_dummy
+    dummy_path("spec/dummy")
+    super
+  end
+
+  def skip_test_unit?
+    true
+  end
+end
diff --git a/railties/test/fixtures/lib/plugin_builders/tweak_builder.rb b/railties/test/fixtures/lib/plugin_builders/tweak_builder.rb
new file mode 100644
index 0000000000..1e801409a4
--- /dev/null
+++ b/railties/test/fixtures/lib/plugin_builders/tweak_builder.rb
@@ -0,0 +1,7 @@
+class PluginBuilder < Rails::PluginBuilder
+  def gitignore
+    create_file ".gitignore", <<-R.strip
+foobar
+    R
+  end
+end
diff --git a/railties/test/fixtures/lib/simple_builder.rb b/railties/test/fixtures/lib/simple_builder.rb
deleted file mode 100644
index 47dcdc0d96..0000000000
--- a/railties/test/fixtures/lib/simple_builder.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class AppBuilder
-  def configru
-    create_file "config.ru", <<-R.strip
-run proc { |env| [200, { "Content-Type" => "text/html" }, ["Hello World"]] }
-    R
-  end
-end
\ No newline at end of file
diff --git a/railties/test/fixtures/lib/tweak_builder.rb b/railties/test/fixtures/lib/tweak_builder.rb
deleted file mode 100644
index eed20ecc9b..0000000000
--- a/railties/test/fixtures/lib/tweak_builder.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class AppBuilder < Rails::AppBuilder
-  def configru
-    create_file "config.ru", <<-R.strip
-run proc { |env| [200, { "Content-Type" => "text/html" }, ["Hello World"]] }
-    R
-  end
-end
\ No newline at end of file
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index f4d2027874..6b2026ad0c 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -1,6 +1,7 @@
 require 'abstract_unit'
 require 'generators/generators_test_helper'
 require 'rails/generators/rails/app/app_generator'
+require 'generators/shared_generator_tests.rb'
 
 DEFAULT_APP_FILES = %w(
   .gitignore
@@ -40,36 +41,10 @@ DEFAULT_APP_FILES = %w(
 class AppGeneratorTest < Rails::Generators::TestCase
   include GeneratorsTestHelper
   arguments [destination_root]
+  include SharedGeneratorTests
 
-  def setup
-    Rails.application = TestApp::Application
-    super
-    Rails::Generators::AppGenerator.instance_variable_set('@desc', nil)
-    @bundle_command = File.basename(Thor::Util.ruby_command).sub(/ruby/, 'bundle')
-    
-    Kernel::silence_warnings do
-      Thor::Base.shell.send(:attr_accessor, :always_force)
-      @shell = Thor::Base.shell.new
-      @shell.send(:always_force=, true)
-    end
-  end
-
-  def teardown
-    super
-    Rails::Generators::AppGenerator.instance_variable_set('@desc', nil)
-    Rails.application = TestApp::Application.instance
-  end
-
-  def test_application_skeleton_is_created
-    run_generator
-
-    DEFAULT_APP_FILES.each{ |path| assert_file path }
-  end
-
-  def test_application_generate_pretend
-    run_generator ["testapp", "--pretend"]
-
-    DEFAULT_APP_FILES.each{ |path| assert_no_file path }
+  def default_files
+    ::DEFAULT_APP_FILES
   end
 
   def test_application_controller_and_layout_files
@@ -78,36 +53,11 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_no_file "public/stylesheets/application.css"
   end
 
-  def test_options_before_application_name_raises_an_error
-    content = capture(:stderr){ run_generator(["--skip-active-record", destination_root]) }
-    assert_equal "Options should be given after the application name. For details run: rails --help\n", content
-  end
-
-  def test_name_collision_raises_an_error
-    reserved_words = %w[application destroy plugin runner test]
-    reserved_words.each do |reserved|
-      content = capture(:stderr){ run_generator [File.join(destination_root, reserved)] }
-      assert_equal "Invalid application name #{reserved}. Please give a name which does not match one of the reserved rails words.\n", content
-    end
-  end
-
-  def test_invalid_database_option_raises_an_error
-    content = capture(:stderr){ run_generator([destination_root, "-d", "unknown"]) }
-    assert_match /Invalid value for \-\-database option/, content
-  end
-
   def test_invalid_application_name_raises_an_error
     content = capture(:stderr){ run_generator [File.join(destination_root, "43-things")] }
     assert_equal "Invalid application name 43-things. Please give a name which does not start with numbers.\n", content
   end
 
-  def test_application_name_raises_an_error_if_name_already_used_constant
-    %w{ String Hash Class Module Set Symbol }.each do |ruby_class|
-      content = capture(:stderr){ run_generator [File.join(destination_root, ruby_class)] }
-      assert_equal "Invalid application name #{ruby_class}, constant #{ruby_class} is already in use. Please choose another application name.\n", content
-    end
-  end
-
   def test_invalid_application_name_is_fixed
     run_generator [File.join(destination_root, "things-43")]
     assert_file "things-43/config/environment.rb", /Things43::Application\.initialize!/
@@ -188,18 +138,6 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_file "test"
   end
   
-  def test_test_unit_is_removed_from_frameworks_if_skip_test_unit_is_given
-    run_generator [destination_root, "--skip-test-unit"]
-    assert_file "config/application.rb" do |file|
-      assert_match /config.generators.test_framework = false/, file
-    end
-  end
-  
-  def test_test_unit_is_skipped_if_required
-    run_generator [destination_root, "--skip-test-unit"]
-    assert_no_file "test"    
-  end
-  
   def test_javascript_is_skipped_if_required
     run_generator [destination_root, "--skip-javascript"]
     assert_file "config/application.rb", /^\s+config\.action_view\.javascript_expansions\[:defaults\]\s+=\s+%w\(\)/
@@ -224,36 +162,11 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_file "public/javascripts/rails.js", /jQuery/
   end
 
-  def test_shebang_is_added_to_rails_file
-    run_generator [destination_root, "--ruby", "foo/bar/baz"]
-    assert_file "script/rails", /#!foo\/bar\/baz/
-  end
-
-  def test_shebang_when_is_the_same_as_default_use_env
-    run_generator [destination_root, "--ruby", Thor::Util.ruby_command]
-    assert_file "script/rails", /#!\/usr\/bin\/env/
-  end
-
   def test_template_from_dir_pwd
     FileUtils.cd(Rails.root)
     assert_match /It works from file!/, run_generator([destination_root, "-m", "lib/template.rb"])
   end
 
-  def test_template_raises_an_error_with_invalid_path
-    content = capture(:stderr){ run_generator([destination_root, "-m", "non/existant/path"]) }
-    assert_match /The template \[.*\] could not be loaded/, content
-    assert_match /non\/existant\/path/, content
-  end
-
-  def test_template_is_executed_when_supplied
-    path = "http://gist.github.com/103208.txt"
-    template = %{ say "It works!" }
-    template.instance_eval "def read; self; end" # Make the string respond to read
-
-    generator([destination_root], :template => path).expects(:open).with(path, 'Accept' => 'application/x-thor-template').returns(template)
-    assert_match /It works!/, silence(:stdout){ generator.invoke_all }
-  end
-
   def test_usage_read_from_file
     File.expects(:read).returns("USAGE FROM FILE")
     assert_equal "USAGE FROM FILE", Rails::Generators::AppGenerator.desc
@@ -273,19 +186,6 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_file 'lib/test_file.rb', 'heres test data'
   end
 
-  def test_dev_option
-    generator([destination_root], :dev => true).expects(:run).with("#{@bundle_command} install")
-    silence(:stdout){ generator.invoke_all }
-    rails_path = File.expand_path('../../..', Rails.root)
-    assert_file 'Gemfile', /^gem\s+["']rails["'],\s+:path\s+=>\s+["']#{Regexp.escape(rails_path)}["']$/
-  end
-
-  def test_edge_option
-    generator([destination_root], :edge => true).expects(:run).with("#{@bundle_command} install")
-    silence(:stdout){ generator.invoke_all }
-    assert_file 'Gemfile', /^gem\s+["']rails["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/rails.git")}["']$/
-  end
-
 protected
 
   def action(*args, &block)
@@ -299,62 +199,21 @@ class CustomAppGeneratorTest < Rails::Generators::TestCase
   tests Rails::Generators::AppGenerator
 
   arguments [destination_root]
+  include SharedCustomGeneratorTests
 
-  def setup
-    Rails.application = TestApp::Application
-    super
-    Rails::Generators::AppGenerator.instance_variable_set('@desc', nil)
-    @bundle_command = File.basename(Thor::Util.ruby_command).sub(/ruby/, 'bundle')
-  end
-
-  def teardown
-    super
-    Rails::Generators::AppGenerator.instance_variable_set('@desc', nil)
-    Object.class_eval { remove_const :AppBuilder if const_defined?(:AppBuilder) }
-    Rails.application = TestApp::Application.instance
-  end
-
-  def test_builder_option_with_empty_app_builder
-    FileUtils.cd(Rails.root)
-    run_generator([destination_root, "-b", "#{Rails.root}/lib/empty_builder.rb"])
-    DEFAULT_APP_FILES.each{ |path| assert_no_file path }
-  end
-
-  def test_builder_option_with_simple_app_builder
-    FileUtils.cd(Rails.root)
-    run_generator([destination_root, "-b", "#{Rails.root}/lib/simple_builder.rb"])
-    (DEFAULT_APP_FILES - ['config.ru']).each{ |path| assert_no_file path }
-    assert_file "config.ru", %[run proc { |env| [200, { "Content-Type" => "text/html" }, ["Hello World"]] }]
-  end
-
-  def test_builder_option_with_relative_path
-    here = File.expand_path(File.dirname(__FILE__))
-    FileUtils.cd(here)
-    run_generator([destination_root, "-b", "../fixtures/lib/simple_builder.rb"])
-    (DEFAULT_APP_FILES - ['config.ru']).each{ |path| assert_no_file path }
-    assert_file "config.ru", %[run proc { |env| [200, { "Content-Type" => "text/html" }, ["Hello World"]] }]
+protected
+  def default_files
+    ::DEFAULT_APP_FILES
   end
 
-  def test_builder_option_with_tweak_app_builder
-    FileUtils.cd(Rails.root)
-    run_generator([destination_root, "-b", "#{Rails.root}/lib/tweak_builder.rb"])
-    DEFAULT_APP_FILES.each{ |path| assert_file path }
-    assert_file "config.ru", %[run proc { |env| [200, { "Content-Type" => "text/html" }, ["Hello World"]] }]
+  def builders_dir
+    "app_builders"
   end
 
-  def test_builder_option_with_http
-    path = "http://gist.github.com/103208.txt"
-    template = "class AppBuilder; end"
-    template.instance_eval "def read; self; end" # Make the string respond to read
-
-    generator([destination_root], :builder => path).expects(:open).with(path, 'Accept' => 'application/x-thor-template').returns(template)
-    capture(:stdout) { generator.invoke_all }
-
-    DEFAULT_APP_FILES.each{ |path| assert_no_file path }
+  def builder_class
+    :AppBuilder
   end
 
-protected
-
   def action(*args, &block)
     silence(:stdout){ generator.send(*args, &block) }
   end
diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb
index d1190fd17d..d61a02d32f 100644
--- a/railties/test/generators/namespaced_generators_test.rb
+++ b/railties/test/generators/namespaced_generators_test.rb
@@ -3,6 +3,7 @@ require 'rails/generators/rails/controller/controller_generator'
 require 'rails/generators/rails/model/model_generator'
 require 'rails/generators/rails/observer/observer_generator'
 require 'rails/generators/mailer/mailer_generator'
+require 'rails/generators/rails/scaffold/scaffold_generator'
 
 class NamespacedGeneratorTestCase < Rails::Generators::TestCase
   def setup
@@ -202,3 +203,155 @@ class NamespacedMailerGeneratorTest < NamespacedGeneratorTestCase
     assert_file "app/views/test_app/notifier"
   end
 end
+
+class NamespacedScaffoldGeneratorTest < NamespacedGeneratorTestCase
+  include GeneratorsTestHelper
+  arguments %w(product_line title:string price:integer)
+  tests Rails::Generators::ScaffoldGenerator
+
+  setup :copy_routes
+
+  def test_scaffold_on_invoke
+    run_generator
+
+    # Model
+    assert_file "app/models/test_app/product_line.rb", /module TestApp\n  class ProductLine < ActiveRecord::Base/
+    assert_file "test/unit/test_app/product_line_test.rb", /module TestApp\n  class ProductLineTest < ActiveSupport::TestCase/
+    assert_file "test/fixtures/test_app/product_lines.yml"
+    assert_migration "db/migrate/create_test_app_product_lines.rb"
+
+    # Route
+    assert_file "config/routes.rb" do |route|
+      assert_match(/resources :product_lines$/, route)
+    end
+
+    # Controller
+    assert_file "app/controllers/test_app/product_lines_controller.rb" do |content|
+      assert_match(/module TestApp\n  class ProductLinesController < ApplicationController/, content)
+    end
+
+    assert_file "test/functional/test_app/product_lines_controller_test.rb",
+                /module TestApp\n  class ProductLinesControllerTest < ActionController::TestCase/
+
+    # Views
+    %w(
+      index
+      edit
+      new
+      show
+      _form
+    ).each { |view| assert_file "app/views/test_app/product_lines/#{view}.html.erb" }
+    assert_no_file "app/views/layouts/test_app/product_lines.html.erb"
+
+    # Helpers
+    assert_file "app/helpers/test_app/product_lines_helper.rb"
+    assert_file "test/unit/helpers/test_app/product_lines_helper_test.rb"
+
+    # Stylesheets
+    assert_file "public/stylesheets/scaffold.css"
+  end
+
+  def test_scaffold_on_revoke
+    run_generator
+    run_generator ["product_line"], :behavior => :revoke
+
+    # Model
+    assert_no_file "app/models/test_app/product_line.rb"
+    assert_no_file "test/unit/test_app/product_line_test.rb"
+    assert_no_file "test/fixtures/test_app/product_lines.yml"
+    assert_no_migration "db/migrate/create_test_app_product_lines.rb"
+
+    # Route
+    assert_file "config/routes.rb" do |route|
+      assert_no_match(/resources :product_lines$/, route)
+    end
+
+    # Controller
+    assert_no_file "app/controllers/test_app/product_lines_controller.rb"
+    assert_no_file "test/functional/test_app/product_lines_controller_test.rb"
+
+    # Views
+    assert_no_file "app/views/test_app/product_lines"
+    assert_no_file "app/views/test_app/layouts/product_lines.html.erb"
+
+    # Helpers
+    assert_no_file "app/helpers/test_app/product_lines_helper.rb"
+    assert_no_file "test/unit/helpers/test_app/product_lines_helper_test.rb"
+
+    # Stylesheets (should not be removed)
+    assert_file "public/stylesheets/scaffold.css"
+  end
+
+  def test_scaffold_with_namespace_on_invoke
+    run_generator [ "admin/role", "name:string", "description:string" ]
+
+    # Model
+    assert_file "app/models/test_app/admin.rb", /module TestApp\n  module Admin/
+    assert_file "app/models/test_app/admin/role.rb", /module TestApp\n  class Admin::Role < ActiveRecord::Base/
+    assert_file "test/unit/test_app/admin/role_test.rb", /module TestApp\n  class Admin::RoleTest < ActiveSupport::TestCase/
+    assert_file "test/fixtures/test_app/admin/roles.yml"
+    assert_migration "db/migrate/create_test_app_admin_roles.rb"
+
+    # Route
+    assert_file "config/routes.rb" do |route|
+      assert_match(/namespace :admin do resources :roles end$/, route)
+    end
+
+    # Controller
+    assert_file "app/controllers/test_app/admin/roles_controller.rb" do |content|
+      assert_match(/module TestApp\n  class Admin::RolesController < ApplicationController/, content)
+    end
+
+    assert_file "test/functional/test_app/admin/roles_controller_test.rb",
+                /module TestApp\n  class Admin::RolesControllerTest < ActionController::TestCase/
+
+    # Views
+    %w(
+      index
+      edit
+      new
+      show
+      _form
+    ).each { |view| assert_file "app/views/test_app/admin/roles/#{view}.html.erb" }
+    assert_no_file "app/views/layouts/admin/roles.html.erb"
+
+    # Helpers
+    assert_file "app/helpers/test_app/admin/roles_helper.rb"
+    assert_file "test/unit/helpers/test_app/admin/roles_helper_test.rb"
+
+    # Stylesheets
+    assert_file "public/stylesheets/scaffold.css"
+  end
+
+  def test_scaffold_with_namespace_on_revoke
+    run_generator [ "admin/role", "name:string", "description:string" ]
+    run_generator [ "admin/role" ], :behavior => :revoke
+
+    # Model
+    assert_file "app/models/test_app/admin.rb"	# ( should not be remove )
+    assert_no_file "app/models/test_app/admin/role.rb"
+    assert_no_file "test/unit/test_app/admin/role_test.rb"
+    assert_no_file "test/fixtures/test_app/admin/roles.yml"
+    assert_no_migration "db/migrate/create_test_app_admin_roles.rb"
+
+    # Route
+    assert_file "config/routes.rb" do |route|
+      assert_no_match(/namespace :admin do resources :roles end$/, route)
+    end
+
+    # Controller
+    assert_no_file "app/controllers/test_app/admin/roles_controller.rb"
+    assert_no_file "test/functional/test_app/admin/roles_controller_test.rb"
+
+    # Views
+    assert_no_file "app/views/test_app/admin/roles"
+    assert_no_file "app/views/layouts/test_app/admin/roles.html.erb"
+
+    # Helpers
+    assert_no_file "app/helpers/test_app/admin/roles_helper.rb"
+    assert_no_file "test/unit/helpers/test_app/admin/roles_helper_test.rb"
+
+    # Stylesheets (should not be removed)
+    assert_file "public/stylesheets/scaffold.css"
+  end
+end
diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb
new file mode 100644
index 0000000000..8dc5ca90ba
--- /dev/null
+++ b/railties/test/generators/plugin_new_generator_test.rb
@@ -0,0 +1,192 @@
+require 'abstract_unit'
+require 'generators/generators_test_helper'
+require 'rails/generators/rails/plugin_new/plugin_new_generator'
+require 'generators/shared_generator_tests.rb'
+
+DEFAULT_PLUGIN_FILES = %w(
+  .gitignore
+  Gemfile
+  Rakefile
+  bukkits.gemspec
+  MIT-LICENSE
+  lib
+  lib/bukkits.rb
+  lib/tasks/bukkits_tasks.rake
+  script/rails
+  test/bukkits_test.rb
+  test/test_helper.rb
+  test/dummy
+)
+
+
+class PluginNewGeneratorTest < Rails::Generators::TestCase
+  include GeneratorsTestHelper
+  destination File.join(Rails.root, "tmp/bukkits")
+  arguments [destination_root]
+  include SharedGeneratorTests
+
+  def default_files
+    ::DEFAULT_PLUGIN_FILES
+  end
+
+  def test_invalid_plugin_name_raises_an_error
+    content = capture(:stderr){ run_generator [File.join(destination_root, "43-things")] }
+    assert_equal "Invalid plugin name 43-things. Please give a name which does not start with numbers.\n", content
+  end
+
+  def test_invalid_plugin_name_is_fixed
+    run_generator [File.join(destination_root, "things-43")]
+    assert_file "things-43/lib/things-43.rb", /module Things43/
+  end
+
+  def test_generating_test_files
+    run_generator
+    assert_file "test/test_helper.rb"
+    assert_file "test/bukkits_test.rb", /assert_kind_of Module, Bukkits/
+  end
+
+  def test_generating_test_files_in_full_mode
+    run_generator [destination_root, "--full"]
+    assert_directory "test/integration/"
+
+    assert_file "test/integration/navigation_test.rb", /ActionDispatch::IntegrationTest/
+  end
+
+  def test_ensure_that_plugin_options_are_not_passed_to_app_generator
+    FileUtils.cd(Rails.root)
+    assert_no_match /It works from file!.*It works_from_file/, run_generator([destination_root, "-m", "lib/template.rb"])
+  end
+
+  def test_ensure_that_test_dummy_can_be_generated_from_a_template
+    FileUtils.cd(Rails.root)
+    run_generator([destination_root, "-m", "lib/create_test_dummy_template.rb", "--skip-test-unit"])
+    assert_file "spec/dummy"
+    assert_no_file "test"
+  end
+
+  def test_database_entry_is_assed_by_default_in_full_mode
+    run_generator([destination_root, "--full"])
+    assert_file "test/dummy/config/database.yml", /sqlite/
+    assert_file "Gemfile", /^gem\s+["']sqlite3-ruby["'],\s+:require\s+=>\s+["']sqlite3["']$/
+  end
+
+  def test_config_another_database
+    run_generator([destination_root, "-d", "mysql", "--full"])
+    assert_file "test/dummy/config/database.yml", /mysql/
+    assert_file "Gemfile", /^gem\s+["']mysql2["']$/
+  end
+
+  def test_active_record_is_removed_from_frameworks_if_skip_active_record_is_given
+    run_generator [destination_root, "--skip-active-record"]
+    assert_file "test/dummy/config/application.rb", /#\s+require\s+["']active_record\/railtie["']/
+  end
+
+  def test_ensure_that_skip_active_record_option_is_passed_to_app_generator
+    run_generator [destination_root, "--skip_active_record"]
+    assert_no_file "test/dummy/config/database.yml"
+    assert_no_match /ActiveRecord/, File.read(File.join(destination_root, "test/test_helper.rb"))
+  end
+
+  def test_ensure_that_database_option_is_passed_to_app_generator
+    run_generator [destination_root, "--database", "postgresql"]
+    assert_file "test/dummy/config/database.yml", /postgres/
+  end
+
+  def test_ensure_that_javascript_option_is_passed_to_app_generator
+    run_generator [destination_root, "--javascript", "jquery"]
+    assert_file "test/dummy/public/javascripts/jquery.js"
+  end
+
+  def test_ensure_that_skip_javascript_option_is_passed_to_app_generator
+    run_generator [destination_root, "--skip_javascript"]
+    assert_no_file "test/dummy/public/javascripts/prototype.js"
+  end
+
+  def test_template_from_dir_pwd
+    FileUtils.cd(Rails.root)
+    assert_match /It works from file!/, run_generator([destination_root, "-m", "lib/template.rb"])
+  end
+
+  def test_ensure_that_tests_works
+    run_generator
+    FileUtils.cd destination_root
+    `bundle install`
+    assert_match /1 tests, 1 assertions, 0 failures, 0 errors/, `bundle exec rake test`
+  end
+
+  def test_ensure_that_tests_works_in_full_mode
+    run_generator [destination_root, "--full"]
+    FileUtils.cd destination_root
+    `bundle install`
+    assert_match /2 tests, 2 assertions, 0 failures, 0 errors/, `bundle exec rake test`
+  end
+
+  def test_creating_engine_in_full_mode
+    run_generator [destination_root, "--full"]
+    assert_file "lib/bukkits/engine.rb", /module Bukkits\n  class Engine < Rails::Engine\n  end\nend/
+    assert_file "lib/bukkits.rb", /require "bukkits\/engine"/
+  end
+
+  def test_being_quiet_while_creating_dummy_application
+    assert_no_match /create\s+config\/application.rb/, run_generator
+  end
+
+  def test_create_mountable_application_with_mountable_option
+    run_generator [destination_root, "--mountable"]
+    assert_file "config/routes.rb", /Bukkits::Engine.routes.draw do/
+    assert_file "lib/bukkits/engine.rb", /isolate_namespace Bukkits/
+    assert_file "test/dummy/config/routes.rb", /mount Bukkits::Engine => "\/bukkits"/
+    assert_file "app/controllers/bukkits/application_controller.rb", /module Bukkits\n  class ApplicationController < ActiveController::Base/
+    assert_file "app/helpers/bukkits/application_helper.rb", /module Bukkits\n  module ApplicationHelper/
+  end
+
+  def test_passing_dummy_path_as_a_parameter
+    run_generator [destination_root, "--dummy_path", "spec/dummy"]
+    assert_file "spec/dummy"
+    assert_file "spec/dummy/config/application.rb"
+    assert_no_file "test/dummy"
+  end
+
+protected
+
+  def action(*args, &block)
+    silence(:stdout){ generator.send(*args, &block) }
+  end
+
+end
+
+class CustomPluginGeneratorTest < Rails::Generators::TestCase
+  include GeneratorsTestHelper
+  tests Rails::Generators::PluginNewGenerator
+
+  destination File.join(Rails.root, "tmp/bukkits")
+  arguments [destination_root]
+  include SharedCustomGeneratorTests
+
+  def test_overriding_test_framework
+    FileUtils.cd(destination_root)
+    run_generator([destination_root, "-b", "#{Rails.root}/lib/plugin_builders/spec_builder.rb"])
+    assert_file 'spec/spec_helper.rb'
+    assert_file 'spec/dummy'
+    assert_file 'Rakefile', /task :default => :spec/
+    assert_file 'Rakefile', /# spec tasks in rakefile/
+    assert_file 'script/rails', %r{spec/dummy}
+  end
+
+protected
+  def default_files
+    ::DEFAULT_PLUGIN_FILES
+  end
+
+  def builder_class
+    :PluginBuilder
+  end
+
+  def builders_dir
+    "plugin_builders"
+  end
+
+  def action(*args, &block)
+    silence(:stdout){ generator.send(*args, &block) }
+  end
+end
diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb
new file mode 100644
index 0000000000..d117656fbd
--- /dev/null
+++ b/railties/test/generators/shared_generator_tests.rb
@@ -0,0 +1,187 @@
+module SharedGeneratorTests
+  def setup
+    Rails.application = TestApp::Application
+    super
+    Rails::Generators::AppGenerator.instance_variable_set('@desc', nil)
+    @bundle_command = File.basename(Thor::Util.ruby_command).sub(/ruby/, 'bundle')
+
+    Kernel::silence_warnings do
+      Thor::Base.shell.send(:attr_accessor, :always_force)
+      @shell = Thor::Base.shell.new
+      @shell.send(:always_force=, true)
+    end
+  end
+
+  def teardown
+    super
+    Rails::Generators::AppGenerator.instance_variable_set('@desc', nil)
+    Rails.application = TestApp::Application.instance
+  end
+
+  def test_skeleton_is_created
+    run_generator
+
+    default_files.each{ |path| assert_file path }
+  end
+
+  def test_plugin_new_generate_pretend
+    run_generator ["testapp", "--pretend"]
+
+    default_files.each{ |path| assert_no_file path }
+  end
+
+  def test_invalid_database_option_raises_an_error
+    content = capture(:stderr){ run_generator([destination_root, "-d", "unknown"]) }
+    assert_match /Invalid value for \-\-database option/, content
+  end
+
+  def test_test_unit_is_skipped_if_required
+    run_generator [destination_root, "--skip-test-unit"]
+    assert_no_file "test"
+  end
+
+  def test_options_before_application_name_raises_an_error
+    content = capture(:stderr){ run_generator(["--pretend", destination_root]) }
+    assert_match /Options should be given after the \w+ name. For details run: rails( plugin)? --help\n/, content
+  end
+
+  def test_name_collision_raises_an_error
+    reserved_words = %w[application destroy plugin runner test]
+    reserved_words.each do |reserved|
+      content = capture(:stderr){ run_generator [File.join(destination_root, reserved)] }
+      assert_match /Invalid \w+ name #{reserved}. Please give a name which does not match one of the reserved rails words.\n/, content
+    end
+  end
+
+  def test_name_raises_an_error_if_name_already_used_constant
+    %w{ String Hash Class Module Set Symbol }.each do |ruby_class|
+      content = capture(:stderr){ run_generator [File.join(destination_root, ruby_class)] }
+      assert_match /Invalid \w+ name #{ruby_class}, constant #{ruby_class} is already in use. Please choose another \w+ name.\n/, content
+    end
+  end
+
+  def test_shebang_is_added_to_rails_file
+    run_generator [destination_root, "--ruby", "foo/bar/baz"]
+    assert_file "script/rails", /#!foo\/bar\/baz/
+  end
+
+  def test_shebang_when_is_the_same_as_default_use_env
+    run_generator [destination_root, "--ruby", Thor::Util.ruby_command]
+    assert_file "script/rails", /#!\/usr\/bin\/env/
+  end
+
+  def test_template_raises_an_error_with_invalid_path
+    content = capture(:stderr){ run_generator([destination_root, "-m", "non/existant/path"]) }
+    assert_match /The template \[.*\] could not be loaded/, content
+    assert_match /non\/existant\/path/, content
+  end
+
+  def test_template_is_executed_when_supplied
+    path = "http://gist.github.com/103208.txt"
+    template = %{ say "It works!" }
+    template.instance_eval "def read; self; end" # Make the string respond to read
+
+    generator([destination_root], :template => path).expects(:open).with(path, 'Accept' => 'application/x-thor-template').returns(template)
+    assert_match /It works!/, silence(:stdout){ generator.invoke_all }
+  end
+
+  def test_dev_option
+    generator([destination_root], :dev => true).expects(:run).with("#{@bundle_command} install")
+    silence(:stdout){ generator.invoke_all }
+    rails_path = File.expand_path('../../..', Rails.root)
+    assert_file 'Gemfile', /^gem\s+["']rails["'],\s+:path\s+=>\s+["']#{Regexp.escape(rails_path)}["']$/
+  end
+
+  def test_edge_option
+    generator([destination_root], :edge => true).expects(:run).with("#{@bundle_command} install")
+    silence(:stdout){ generator.invoke_all }
+    assert_file 'Gemfile', %r{^gem\s+["']rails["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/rails.git")}["']$}
+  end
+
+  def test_template_raises_an_error_with_invalid_path
+    content = capture(:stderr){ run_generator([destination_root, "-m", "non/existant/path"]) }
+    assert_match /The template \[.*\] could not be loaded/, content
+    assert_match /non\/existant\/path/, content
+  end
+
+  def test_template_is_executed_when_supplied
+    path = "http://gist.github.com/103208.txt"
+    template = %{ say "It works!" }
+    template.instance_eval "def read; self; end" # Make the string respond to read
+
+    generator([destination_root], :template => path).expects(:open).with(path, 'Accept' => 'application/x-thor-template').returns(template)
+    assert_match /It works!/, silence(:stdout){ generator.invoke_all }
+  end
+
+  def test_dev_option
+    generator([destination_root], :dev => true).expects(:run).with("#{@bundle_command} install")
+    silence(:stdout){ generator.invoke_all }
+    rails_path = File.expand_path('../../..', Rails.root)
+    assert_file 'Gemfile', /^gem\s+["']rails["'],\s+:path\s+=>\s+["']#{Regexp.escape(rails_path)}["']$/
+  end
+
+  def test_edge_option
+    generator([destination_root], :edge => true).expects(:run).with("#{@bundle_command} install")
+    silence(:stdout){ generator.invoke_all }
+    assert_file 'Gemfile', %r{^gem\s+["']rails["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/rails.git")}["']$}
+  end
+end
+
+module SharedCustomGeneratorTests
+  def setup
+    Rails.application = TestApp::Application
+    super
+    Rails::Generators::AppGenerator.instance_variable_set('@desc', nil)
+    @bundle_command = File.basename(Thor::Util.ruby_command).sub(/ruby/, 'bundle')
+  end
+
+  def teardown
+    super
+    Rails::Generators::AppGenerator.instance_variable_set('@desc', nil)
+    Object.class_eval do
+      remove_const :AppBuilder if const_defined?(:AppBuilder)
+      remove_const :PluginBuilder if const_defined?(:PluginBuilder)
+    end
+    Rails.application = TestApp::Application.instance
+  end
+
+  def test_builder_option_with_empty_app_builder
+    FileUtils.cd(destination_root)
+    run_generator([destination_root, "-b", "#{Rails.root}/lib/#{builders_dir}/empty_builder.rb"])
+    default_files.each{ |path| assert_no_file path }
+  end
+
+  def test_builder_option_with_simple_plugin_builder
+    FileUtils.cd(destination_root)
+    run_generator([destination_root, "-b", "#{Rails.root}/lib/#{builders_dir}/simple_builder.rb"])
+    (default_files - ['.gitignore']).each{ |path| assert_no_file path }
+    assert_file ".gitignore", "foobar"
+  end
+
+  def test_builder_option_with_relative_path
+    here = File.expand_path(File.dirname(__FILE__))
+    FileUtils.cd(here)
+    run_generator([destination_root, "-b", "../fixtures/lib/#{builders_dir}/simple_builder.rb"])
+    FileUtils.cd(destination_root)
+    (default_files - ['.gitignore']).each{ |path| assert_no_file path }
+    assert_file ".gitignore", "foobar"
+  end
+
+  def test_builder_option_with_tweak_plugin_builder
+    FileUtils.cd(destination_root)
+    run_generator([destination_root, "-b", "#{Rails.root}/lib/#{builders_dir}/tweak_builder.rb"])
+    default_files.each{ |path| assert_file path }
+    assert_file ".gitignore", "foobar"
+  end
+
+  def test_builder_option_with_http
+    path = "http://gist.github.com/103208.txt"
+    template = "class #{builder_class}; end"
+    template.instance_eval "def read; self; end" # Make the string respond to read
+
+    generator([destination_root], :builder => path).expects(:open).with(path, 'Accept' => 'application/x-thor-template').returns(template)
+    capture(:stdout) { generator.invoke_all }
+
+    default_files.each{ |path| assert_no_file path }
+  end
+end
diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index 4b52260ecc..822be24ef1 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -685,5 +685,25 @@ module RailtiesTest
       assert_equal :haml      , generators[:template_engine]
       assert_equal :rspec     , generators[:test_framework]
     end
+
+    test "engine should get default generators with ability to overwrite them" do
+      @plugin.write "lib/bukkits.rb", <<-RUBY
+        module Bukkits
+          class Engine < ::Rails::Engine
+            config.generators.test_framework :rspec
+          end
+        end
+      RUBY
+
+      boot_rails
+      require "#{rails_root}/config/environment"
+
+      generators = Bukkits::Engine.config.generators.options[:rails]
+      assert_equal :active_record, generators[:orm]
+      assert_equal :rspec        , generators[:test_framework]
+
+      app_generators = Rails.application.config.generators.options[:rails]
+      assert_equal :test_unit    , app_generators[:test_framework]
+    end
   end
 end