From 5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Wed, 25 Apr 2012 17:17:49 +0000 Subject: Merged rails-3.2 branch. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/unit/lib/redmine/hook_test.rb | 2 +- test/unit/lib/redmine/wiki_formatting/macros_test.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'test/unit/lib') diff --git a/test/unit/lib/redmine/hook_test.rb b/test/unit/lib/redmine/hook_test.rb index 1b0034c95..07aeb1aff 100644 --- a/test/unit/lib/redmine/hook_test.rb +++ b/test/unit/lib/redmine/hook_test.rb @@ -17,7 +17,7 @@ require File.expand_path('../../../../test_helper', __FILE__) -class Redmine::Hook::ManagerTest < ActiveSupport::TestCase +class Redmine::Hook::ManagerTest < ActionView::TestCase fixtures :issues diff --git a/test/unit/lib/redmine/wiki_formatting/macros_test.rb b/test/unit/lib/redmine/wiki_formatting/macros_test.rb index 3f4966bbf..7a8eb1170 100644 --- a/test/unit/lib/redmine/wiki_formatting/macros_test.rb +++ b/test/unit/lib/redmine/wiki_formatting/macros_test.rb @@ -21,6 +21,7 @@ class Redmine::WikiFormatting::MacrosTest < ActionView::TestCase include ApplicationHelper include ActionView::Helpers::TextHelper include ActionView::Helpers::SanitizeHelper + include ERB::Util extend ActionView::Helpers::SanitizeHelper::ClassMethods fixtures :projects, :roles, :enabled_modules, :users, -- cgit v1.2.3