Bring helpers_dir deprecation back.

2 files changed, 12 insertions, 11 deletions

diff --git a/actionpack/lib/action_controller/metal/helpers.rb b/actionpack/lib/action_controller/metal/helpers.rb
index ab2e0c020e..05843a061b 100644
--- a/actionpack/lib/action_controller/metal/helpers.rb
+++ b/actionpack/lib/action_controller/metal/helpers.rb
@@ -56,10 +56,12 @@ module ActionController
 
     module ClassMethods
       def helpers_dir
+        ActiveSupport::Deprecation.warn "helpers_dir is deprecated, use helpers_path instead"
         self.helpers_path
       end
 
       def helpers_dir=(value)
+        ActiveSupport::Deprecation.warn "helpers_dir= is deprecated, use helpers_path= instead"
         self.helpers_path = Array(value)
       end
 
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