aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/abstract_unit.rb
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2010-03-03 19:45:08 -0800
committerCarl Lerche <carllerche@mac.com>2010-03-03 21:24:27 -0800
commit1f0f05b10c924d2f0d0ff4c74cbd979e77deea1d (patch)
tree34121d202d4d176944b26d51aec84edaaecf0286 /actionpack/test/abstract_unit.rb
parentb160663bd13d08bf845bc8cdf87a2c5e7e46f901 (diff)
downloadrails-1f0f05b10c924d2f0d0ff4c74cbd979e77deea1d.tar.gz
rails-1f0f05b10c924d2f0d0ff4c74cbd979e77deea1d.tar.bz2
rails-1f0f05b10c924d2f0d0ff4c74cbd979e77deea1d.zip
Move the original config method onto AbstractController
Diffstat (limited to 'actionpack/test/abstract_unit.rb')
-rw-r--r--actionpack/test/abstract_unit.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 7223a7824e..29270ed228 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -109,7 +109,7 @@ class BasicController
attr_accessor :request
def config
- @config ||= ActiveSupport::InheritableOptions.new(ActionController::Metal.config).tap do |config|
+ @config ||= ActiveSupport::InheritableOptions.new(ActionController::Base.config).tap do |config|
# VIEW TODO: View tests should not require a controller
public_dir = File.expand_path("../fixtures/public", __FILE__)
config.assets_dir = public_dir