Commit 72ddf61f authored by jplang's avatar jplang

Fixed that macros with uppercase letters can not be called (#12744).

git-svn-id: https://svn.redmine.org/redmine/trunk@11126 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 024528f1
......@@ -147,10 +147,10 @@ module Redmine
unless block_given?
raise "Can not create a macro without a block!"
end
name = name.to_sym if name.is_a?(String)
name = name.to_s.downcase.to_sym
available_macros[name] = {:desc => @@desc || ''}.merge(options)
@@desc = nil
Definitions.send :define_method, "macro_#{name}".downcase, &block
Definitions.send :define_method, "macro_#{name}", &block
end
# Sets description for the next macro to be defined
......
......@@ -78,6 +78,12 @@ class Redmine::WikiFormatting::MacrosTest < ActionView::TestCase
assert_equal "<p>Baz: (arg1,arg2) (String) (line1\nline2)</p>", textilizable("{{baz(arg1, arg2)\nline1\nline2\n}}")
end
def test_macro_name_with_upper_case
Redmine::WikiFormatting::Macros.macro(:UpperCase) {|obj, args| "Upper"}
assert_equal "<p>Upper</p>", textilizable("{{UpperCase}}")
end
def test_multiple_macros_on_the_same_line
Redmine::WikiFormatting::Macros.macro :foo do |obj, args|
args.any? ? "args: #{args.join(',')}" : "no args"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment