From 8a7796aea997d5e8ba9d60b731904cca4dd1f479 Mon Sep 17 00:00:00 2001
From: Chaker Nakhli <chaker.nakhli@sinbadsoft.com>
Date: Tue, 28 Oct 2014 12:17:06 +0100
Subject: [PATCH 1/2] Add ActiveSupport load hook for DeviseController

---
 app/controllers/devise_controller.rb           |  2 ++
 test/controllers/load_hooks_controller_test.rb | 15 +++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 test/controllers/load_hooks_controller_test.rb

diff --git a/app/controllers/devise_controller.rb b/app/controllers/devise_controller.rb
index 20cc161f..722170ca 100644
--- a/app/controllers/devise_controller.rb
+++ b/app/controllers/devise_controller.rb
@@ -180,4 +180,6 @@ MESSAGE
   def resource_params
     params.fetch(resource_name, {})
   end
+
+  ActiveSupport.run_load_hooks(:devise_controller, self)
 end
diff --git a/test/controllers/load_hooks_controller_test.rb b/test/controllers/load_hooks_controller_test.rb
new file mode 100644
index 00000000..3b9493c5
--- /dev/null
+++ b/test/controllers/load_hooks_controller_test.rb
@@ -0,0 +1,15 @@
+require 'test_helper'
+
+class LoadHooksControllerTest < ActionController::TestCase
+  setup do
+    ActiveSupport.on_load(:devise_controller) do
+      define_method  :defined_by_load_hook do
+        puts 'I am defined dynamically by activesupport load hook'
+      end
+    end
+  end
+
+  test 'load hook called when controller is loaded' do
+    assert DeviseController.instance_methods.include? :defined_by_load_hook
+  end
+end
\ No newline at end of file

From e46a21be16b9c96b08682183b2af72323d570e55 Mon Sep 17 00:00:00 2001
From: Chaker Nakhli <chaker.nakhli@sinbadsoft.com>
Date: Wed, 29 Oct 2014 16:14:38 +0100
Subject: [PATCH 2/2] remove dynamically added method to DeviseController by
 active support load hook test

---
 test/controllers/load_hooks_controller_test.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/controllers/load_hooks_controller_test.rb b/test/controllers/load_hooks_controller_test.rb
index 3b9493c5..4f6d9a8e 100644
--- a/test/controllers/load_hooks_controller_test.rb
+++ b/test/controllers/load_hooks_controller_test.rb
@@ -3,12 +3,16 @@ require 'test_helper'
 class LoadHooksControllerTest < ActionController::TestCase
   setup do
     ActiveSupport.on_load(:devise_controller) do
-      define_method  :defined_by_load_hook do
+      define_method :defined_by_load_hook do
         puts 'I am defined dynamically by activesupport load hook'
       end
     end
   end
 
+  teardown do
+    DeviseController.class_eval { undef :defined_by_load_hook }
+  end
+
   test 'load hook called when controller is loaded' do
     assert DeviseController.instance_methods.include? :defined_by_load_hook
   end