summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2016-06-04 09:56:44 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2016-06-04 09:56:44 +0000
commitcdfebdcec8d9ca174faef69c1caff9ddf71c13fe (patch)
tree007c61d4b2f7d55e7b1034829673d6641d6ef3e6 /test
parent8c09e330d42d7ab0a8ee5e6292b03a00e6ebeb84 (diff)
downloadredmine-cdfebdcec8d9ca174faef69c1caff9ddf71c13fe.tar.gz
redmine-cdfebdcec8d9ca174faef69c1caff9ddf71c13fe.zip
Merged r15442 (#22898).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15444 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test')
-rw-r--r--test/unit/helpers/application_helper_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 35a9b8ce2..89af800be 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -116,7 +116,7 @@ class ApplicationHelperTest < ActionView::TestCase
def test_inline_images
to_test = {
'!http://foo.bar/image.jpg!' => '<img src="http://foo.bar/image.jpg" alt="" />',
- 'floating !>http://foo.bar/image.jpg!' => 'floating <div style="float:right"><img src="http://foo.bar/image.jpg" alt="" /></div>',
+ 'floating !>http://foo.bar/image.jpg!' => 'floating <span style="float:right"><img src="http://foo.bar/image.jpg" alt="" /></span>',
'with class !(some-class)http://foo.bar/image.jpg!' => 'with class <img src="http://foo.bar/image.jpg" class="some-class" alt="" />',
'with style !{width:100px;height:100px}http://foo.bar/image.jpg!' => 'with style <img src="http://foo.bar/image.jpg" style="width:100px;height:100px;" alt="" />',
'with title !http://foo.bar/image.jpg(This is a title)!' => 'with title <img src="http://foo.bar/image.jpg" title="This is a title" alt="This is a title" />',