aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/helper_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/test/controller/helper_test.rb')
-rw-r--r--actionpack/test/controller/helper_test.rb21
1 files changed, 10 insertions, 11 deletions
diff --git a/actionpack/test/controller/helper_test.rb b/actionpack/test/controller/helper_test.rb
index e53e62d1ff..75a96d6497 100644
--- a/actionpack/test/controller/helper_test.rb
+++ b/actionpack/test/controller/helper_test.rb
@@ -135,17 +135,16 @@ class HelperTest < ActiveSupport::TestCase
assert methods.include?('foobar')
end
- # TODO Add this deprecation back before Rails 3.0 final release
- # def test_deprecation
- # assert_deprecated do
- # ActionController::Base.helpers_dir = "some/foo/bar"
- # end
- # assert_deprecated do
- # assert_equal ["some/foo/bar"], ActionController::Base.helpers_dir
- # end
- # ensure
- # ActionController::Base.helpers_path = [File.dirname(__FILE__) + '/../fixtures/helpers']
- # end
+ def test_deprecation
+ assert_deprecated do
+ ActionController::Base.helpers_dir = "some/foo/bar"
+ end
+ assert_deprecated do
+ assert_equal ["some/foo/bar"], ActionController::Base.helpers_dir
+ end
+ ensure
+ ActionController::Base.helpers_path = [File.dirname(__FILE__) + '/../fixtures/helpers']
+ end
private
def expected_helper_methods