summaryrefslogtreecommitdiffstats
path: root/test/unit/lib
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-08-08 16:28:33 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-08-08 16:28:33 +0000
commite2d6f0af4e49c60f5876aa087873650e1ab9b095 (patch)
tree0bee0c8195f5496ef95170f48cd9f0a1ec76817d /test/unit/lib
parent405bcc10c0861a861d506b3cf15d8d32c870bf96 (diff)
downloadredmine-e2d6f0af4e49c60f5876aa087873650e1ab9b095.tar.gz
redmine-e2d6f0af4e49c60f5876aa087873650e1ab9b095.zip
Adds an option to macro definition to disable arguments parsing (#11578).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10174 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/unit/lib')
-rw-r--r--test/unit/lib/redmine/wiki_formatting/macros_test.rb20
1 files changed, 17 insertions, 3 deletions
diff --git a/test/unit/lib/redmine/wiki_formatting/macros_test.rb b/test/unit/lib/redmine/wiki_formatting/macros_test.rb
index 4bea9a57d..4583d3e9b 100644
--- a/test/unit/lib/redmine/wiki_formatting/macros_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/macros_test.rb
@@ -43,12 +43,26 @@ class Redmine::WikiFormatting::MacrosTest < ActionView::TestCase
def test_macro_registration
Redmine::WikiFormatting::Macros.register do
macro :foo do |obj, args|
- "Foo macro output"
+ "Foo: #{args.size} (#{args.join(',')}) (#{args.class.name})"
end
end
- text = "{{foo}}"
- assert_equal '<p>Foo macro output</p>', textilizable(text)
+ assert_equal '<p>Foo: 0 () (Array)</p>', textilizable("{{foo}}")
+ assert_equal '<p>Foo: 0 () (Array)</p>', textilizable("{{foo()}}")
+ assert_equal '<p>Foo: 1 (arg1) (Array)</p>', textilizable("{{foo(arg1)}}")
+ assert_equal '<p>Foo: 2 (arg1,arg2) (Array)</p>', textilizable("{{foo(arg1, arg2)}}")
+ end
+
+ def test_macro_registration_parse_args_set_to_false_should_disable_arguments_parsing
+ Redmine::WikiFormatting::Macros.register do
+ macro :bar, :parse_args => false do |obj, args|
+ "Bar: (#{args}) (#{args.class.name})"
+ end
+ end
+
+ assert_equal '<p>Bar: (args, more args) (String)</p>', textilizable("{{bar(args, more args)}}")
+ assert_equal '<p>Bar: () (String)</p>', textilizable("{{bar}}")
+ assert_equal '<p>Bar: () (String)</p>', textilizable("{{bar()}}")
end
def test_macro_hello_world