diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
commit | 2d1866d966d94c688f9cb87c5bf3f096dffac844 (patch) | |
tree | 7a733c1cc51448ab69b3f892285305dbfb0ae15e /test/integration/lib/redmine/hook_test.rb | |
parent | a6ec78a4dc658e3517ed682792016b6530458696 (diff) | |
download | redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.tar.gz redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.zip |
Merged rails-4.1 branch (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/integration/lib/redmine/hook_test.rb')
-rw-r--r-- | test/integration/lib/redmine/hook_test.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/integration/lib/redmine/hook_test.rb b/test/integration/lib/redmine/hook_test.rb index d6d581402..2746fb5e3 100644 --- a/test/integration/lib/redmine/hook_test.rb +++ b/test/integration/lib/redmine/hook_test.rb @@ -17,7 +17,7 @@ require File.expand_path('../../../../test_helper', __FILE__) -class HookTest < ActionController::IntegrationTest +class HookTest < ActionDispatch::IntegrationTest fixtures :users, :roles, :projects, :members, :member_roles # Hooks that are manually registered later @@ -34,6 +34,8 @@ class HookTest < ActionController::IntegrationTest end end + Redmine::Hook.clear_listeners + class ContentForInsideHook < Redmine::Hook::ViewListener render_on :view_welcome_index_left, :inline => <<-VIEW <% content_for :header_tags do %> |