From 9b0acce9c938e6c1bbbe2c1a4138105513a08b33 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Tue, 24 Nov 2009 22:02:14 +0000 Subject: [PATCH] Fixed: error raised when rendering text that contains an email address with textile disabled (#4268). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3088 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/wiki_formatting.rb | 1 + test/unit/lib/redmine/wiki_formatting.rb | 35 ++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 test/unit/lib/redmine/wiki_formatting.rb diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb index 29472206..f33ef9e6 100644 --- a/lib/redmine/wiki_formatting.rb +++ b/lib/redmine/wiki_formatting.rb @@ -53,6 +53,7 @@ module Redmine class Formatter include ActionView::Helpers::TagHelper include ActionView::Helpers::TextHelper + include ActionView::Helpers::UrlHelper def initialize(text) @text = text diff --git a/test/unit/lib/redmine/wiki_formatting.rb b/test/unit/lib/redmine/wiki_formatting.rb new file mode 100644 index 00000000..f52c84e0 --- /dev/null +++ b/test/unit/lib/redmine/wiki_formatting.rb @@ -0,0 +1,35 @@ +# Redmine - project management software +# Copyright (C) 2006-2009 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +require File.dirname(__FILE__) + '/../../../test_helper' + +class Redmine::WikiFormattingTest < ActiveSupport::TestCase + + def test_should_link_urls_and_email_addresses + raw = <<-DIFF +This is a sample *text* with a link: http://www.redmine.org +and an email address foo@example.net +DIFF + + expected = <<-EXPECTED +

This is a sample *text* with a link: http://www.redmine.org
+and an email address foo@example.net

+EXPECTED + + assert_equal expected.gsub(%r{[\r\n\t]}, ''), Redmine::WikiFormatting::NullFormatter::Formatter.new(raw).to_html.gsub(%r{[\r\n\t]}, '') + end +end -- 2.11.0