diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2010-11-16 16:41:37 +0100 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2010-11-16 16:41:37 +0100 |
| commit | 510375b501d1a158edf579966a51568d539dcd6e (patch) | |
| tree | 99f040c9b041a69906cc02e0f5218d84112cbb15 /railties | |
| parent | ced8ebcee0fa09939f82cacc59a864f5625e4bd5 (diff) | |
| download | rails-510375b501d1a158edf579966a51568d539dcd6e.tar.gz rails-510375b501d1a158edf579966a51568d539dcd6e.tar.bz2 rails-510375b501d1a158edf579966a51568d539dcd6e.zip | |
Fix plugin new --mountable: ActionController instead of ActiveController
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin_new/templates/app/controllers/%name%/application_controller.rb.tt | 2 | ||||
| -rw-r--r-- | railties/test/generators/plugin_new_generator_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/app/controllers/%name%/application_controller.rb.tt b/railties/lib/rails/generators/rails/plugin_new/templates/app/controllers/%name%/application_controller.rb.tt index f225bc9f7f..448ad7f989 100644 --- a/railties/lib/rails/generators/rails/plugin_new/templates/app/controllers/%name%/application_controller.rb.tt +++ b/railties/lib/rails/generators/rails/plugin_new/templates/app/controllers/%name%/application_controller.rb.tt @@ -1,4 +1,4 @@ module <%= camelized %> - class ApplicationController < ActiveController::Base + class ApplicationController < ActionController::Base end end diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb index 43d7523a4c..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 |