Add #3732 helper logic to devise controller: #3864

heartcombo · Dec 18, 2015 · 2006f87 · 2006f87
1 parent 1ac4bdd
commit 2006f87
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/app/controllers/devise_controller.rb b/app/controllers/devise_controller.rb
@@ -2,11 +2,15 @@
 class DeviseController < Devise.parent_controller.constantize
   include Devise::Controllers::ScopedViews
 
-  helper DeviseHelper
+  if respond_to?(:helper)
+    helper DeviseHelper
+  end
 
-  helpers = %w(resource scope_name resource_name signed_in_resource
-               resource_class resource_params devise_mapping)
-  helper_method(*helpers)
+  if respond_to?(:helper_method)
+    helpers = %w(resource scope_name resource_name signed_in_resource
+                 resource_class resource_params devise_mapping)
+    helper_method(*helpers)
+  end
 
   prepend_before_action :assert_is_devise_resource!
   respond_to :html if mimes_for_respond_to.empty?

diff --git a/test/controllers/helper_methods_test.rb b/test/controllers/helper_methods_test.rb
@@ -11,7 +11,8 @@ class HelperMethodsTest < Devise::ControllerTestCase
     assert_includes @controller.class.ancestors, Devise::Controllers::Helpers
   end
 
-  test 'does not respond_to helper_method' do
+  test 'does not respond_to helper or helper_method' do
+    refute_respond_to @controller.class, :helper
     refute_respond_to @controller.class, :helper_method
   end