Merge branch 'master' of git://github.com/rails/rails

1 files changed, 6 insertions, 1 deletions

diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb
index 12cae7cfdf..2105585272 100644
--- a/railties/test/generators/plugin_new_generator_test.rb
+++ b/railties/test/generators/plugin_new_generator_test.rb
@@ -135,7 +135,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
     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/controllers/bukkits/application_controller.rb", /module Bukkits\n  class ApplicationController < ActionController::Base/
     assert_file "app/helpers/bukkits/application_helper.rb", /module Bukkits\n  module ApplicationHelper/
   end
 
@@ -146,6 +146,11 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
     assert_no_file "test/dummy"
   end
 
+  def test_skipping_gemspec
+    run_generator [destination_root, "--skip-gemspec"]
+    assert_no_file "bukkits.gemspec"
+  end
+
 protected
 
   def action(*args, &block)