3 files changed, 16 insertions, 73 deletions
diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb
index 91ab648297..7fdd54fc30 100644
--- a/railties/test/generators/generators_test_helper.rb
+++ b/railties/test/generators/generators_test_helper.rb
@@ -12,7 +12,7 @@ Rails.application.config.generators.templates = [File.join(Rails.root, "lib", "t
 
 # Call configure to load the settings from
 # Rails.application.config.generators to Rails::Generators
-Rails::Generators.configure!(Rails.application.config.generators)
+Rails.application.load_generators
 
 require 'active_record'
 require 'action_dispatch'
diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
deleted file mode 100644
index 5c0774ddbd..0000000000
--- a/railties/test/generators/plugin_generator_test.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-require 'generators/generators_test_helper'
-require 'rails/generators/rails/plugin/plugin_generator'
-
-class PluginGeneratorTest < Rails::Generators::TestCase
-  include GeneratorsTestHelper
-  arguments %w(plugin_fu)
-
-  def test_plugin_skeleton_is_created
-    silence(:stderr) { run_generator }
-    year = Date.today.year
-
-    %w(
-      vendor/plugins
-      vendor/plugins/plugin_fu
-      vendor/plugins/plugin_fu/init.rb
-      vendor/plugins/plugin_fu/install.rb
-      vendor/plugins/plugin_fu/uninstall.rb
-      vendor/plugins/plugin_fu/lib
-      vendor/plugins/plugin_fu/lib/plugin_fu.rb
-      vendor/plugins/plugin_fu/Rakefile
-    ).each{ |path| assert_file path }
-
-    %w(
-      vendor/plugins/plugin_fu/README
-    ).each{ |path| assert_file path, /PluginFu/ }
-
-    %w(
-      vendor/plugins/plugin_fu/README
-      vendor/plugins/plugin_fu/MIT-LICENSE
-    ).each{ |path| assert_file path, /#{year}/ }
-  end
-
-  def test_check_class_collision
-    content = capture(:stderr){ run_generator ["object"] }
-    assert_match(/The name 'Object' is either already used in your application or reserved/, content)
-  end
-
-  def test_invokes_default_test_framework
-    silence(:stderr) { run_generator }
-    assert_file "vendor/plugins/plugin_fu/test/plugin_fu_test.rb", /class PluginFuTest < ActiveSupport::TestCase/
-    assert_file "vendor/plugins/plugin_fu/test/test_helper.rb"
-  end
-
-  def test_logs_if_the_test_framework_cannot_be_found
-    content = nil
-    silence(:stderr) { content = run_generator ["plugin_fu", "--test-framework=rspec"] }
-    assert_match(/rspec \[not found\]/, content)
-  end
-
-  def test_creates_tasks_if_required
-    silence(:stderr) { run_generator ["plugin_fu", "--tasks"] }
-    assert_file "vendor/plugins/plugin_fu/lib/tasks/plugin_fu_tasks.rake"
-  end
-
-  def test_creates_generator_if_required
-    silence(:stderr) { run_generator ["plugin_fu", "--generator"] }
-    assert_file "vendor/plugins/plugin_fu/lib/generators/templates"
-    assert_file "vendor/plugins/plugin_fu/lib/generators/plugin_fu_generator.rb",
-                /class PluginFuGenerator < Rails::Generators::NamedBase/
-  end
-
-  def test_plugin_generator_on_revoke
-    silence(:stderr) { run_generator }
-    run_generator ["plugin_fu"], :behavior => :revoke
-  end
-
-  def test_deprecation
-    output = capture(:stderr) { run_generator }
-    assert_match(/Plugin generator is deprecated, please use 'rails plugin new' command to generate plugin structure./, output)
-  end
-end
diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb
index 5ffc2501cd..b93e33f61a 100644
--- a/railties/test/generators/plugin_new_generator_test.rb
+++ b/railties/test/generators/plugin_new_generator_test.rb
@@ -173,16 +173,22 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
     run_generator
     assert_file "bukkits.gemspec", /s.name = "bukkits"/
     assert_file "bukkits.gemspec", /s.files = Dir\["\{app,config,lib\}\/\*\*\/\*"\]/
+    assert_file "bukkits.gemspec", /s.test_files = Dir\["test\/\*\*\/\*"\]/
     assert_file "bukkits.gemspec", /s.version = "0.0.1"/
   end
 
+  def test_shebang
+    run_generator
+    assert_file "script/rails", /#!\/usr\/bin\/env ruby/
+  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
-  
+
   def test_creating_dummy_without_tests_but_with_dummy_path
     run_generator [destination_root, "--dummy_path", "spec/dummy", "--skip-test-unit"]
     assert_file "spec/dummy"
@@ -190,6 +196,14 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
     assert_no_file "test"
   end
 
+  def test_skipping_test_unit
+    run_generator [destination_root, "--skip-test-unit"]
+    assert_no_file "test"
+    assert_file "bukkits.gemspec" do |contents|
+      assert_no_match /s.test_files = Dir\["test\/\*\*\/\*"\]/, contents
+    end
+  end
+
   def test_skipping_gemspec
     run_generator [destination_root, "--skip-gemspec"]
     assert_no_file "bukkits.gemspec"