diff options
Diffstat (limited to 'railties/helpers')
| -rw-r--r-- | railties/helpers/application.rb (renamed from railties/helpers/abstract_application.rb) | 3 | ||||
| -rw-r--r-- | railties/helpers/test_helper.rb | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/railties/helpers/abstract_application.rb b/railties/helpers/application.rb index fa26cd0399..87ca44126d 100644 --- a/railties/helpers/abstract_application.rb +++ b/railties/helpers/application.rb @@ -1,5 +1,4 @@ # The filters added to this controller will be run for all controllers in the application. # Likewise will all the methods added be available for all controllers. -class AbstractApplicationController < ActionController::Base - helper :application +class ApplicationController < ActionController::Base end
\ No newline at end of file diff --git a/railties/helpers/test_helper.rb b/railties/helpers/test_helper.rb index ce1150c606..83f4069ffd 100644 --- a/railties/helpers/test_helper.rb +++ b/railties/helpers/test_helper.rb @@ -1,6 +1,6 @@ ENV["RAILS_ENV"] ||= "test" require File.dirname(__FILE__) + "/../config/environment" -require 'abstract_application' +require 'application' require 'test/unit' require 'active_record/fixtures' |