diff options
Diffstat (limited to 'railties/helpers')
-rw-r--r-- | railties/helpers/application.rb | 15 | ||||
-rw-r--r-- | railties/helpers/application_controller.rb | 10 | ||||
-rw-r--r-- | railties/helpers/test_helper.rb | 2 |
3 files changed, 11 insertions, 16 deletions
diff --git a/railties/helpers/application.rb b/railties/helpers/application.rb deleted file mode 100644 index 0a3ed822a4..0000000000 --- a/railties/helpers/application.rb +++ /dev/null @@ -1,15 +0,0 @@ -# Filters added to this controller apply to all controllers in the application. -# Likewise, all the methods added will be available for all controllers. - -class ApplicationController < ActionController::Base - helper :all # include all helpers, all the time - - # See ActionController::RequestForgeryProtection for details - # Uncomment the :secret if you're not using the cookie session store - protect_from_forgery # :secret => '<%= app_secret %>' - - # See ActionController::Base for details - # Uncomment this to filter the contents of submitted sensitive data parameters - # from your application log (in this case, all fields with names like "password"). - # filter_parameter_logging :password -end diff --git a/railties/helpers/application_controller.rb b/railties/helpers/application_controller.rb new file mode 100644 index 0000000000..6635a3f487 --- /dev/null +++ b/railties/helpers/application_controller.rb @@ -0,0 +1,10 @@ +# Filters added to this controller apply to all controllers in the application. +# Likewise, all the methods added will be available for all controllers. + +class ApplicationController < ActionController::Base + helper :all # include all helpers, all the time + protect_from_forgery # See ActionController::RequestForgeryProtection for details + + # Scrub sensitive parameters from your log + # filter_parameter_logging :password +end diff --git a/railties/helpers/test_helper.rb b/railties/helpers/test_helper.rb index 9f1926950f..b9fe2517c8 100644 --- a/railties/helpers/test_helper.rb +++ b/railties/helpers/test_helper.rb @@ -2,7 +2,7 @@ ENV["RAILS_ENV"] = "test" require File.expand_path(File.dirname(__FILE__) + "/../config/environment") require 'test_help' -class Test::Unit::TestCase +class ActiveSupport::TestCase # Transactional fixtures accelerate your tests by wrapping each test method # in a transaction that's rolled back on completion. This ensures that the # test database remains unchanged so your fixtures don't have to be reloaded |