Merged r19071 from trunk to 4.1-stable (#32444, #29489).

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19329 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/test/unit/lib/redmine/wiki_formatting/macros_test.rb b/test/unit/lib/redmine/wiki_formatting/macros_test.rb
index 208c0157a406f8e772367b988501d2ae50cc885b..ceda727c81d8e22b67293cb1ed2f70498ec8a75f 100644 (file)
--- a/test/unit/lib/redmine/wiki_formatting/macros_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/macros_test.rb
@@ -33,7 +33,7 @@ class Redmine::WikiFormatting::MacrosTest < Redmine::HelperTest
            :versions, :documents,
            :wikis, :wiki_pages, :wiki_contents,
            :boards, :messages,
-           :attachments
+           :attachments, :enumerations
 
   def setup
     super