summaryrefslogtreecommitdiffstats
path: root/test/unit
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2017-07-02 10:00:07 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2017-07-02 10:00:07 +0000
commita3eb6bf1f7d7b7c34ce703f35c0e045ea722a6fc (patch)
treed41735e5dc8f1e94d29cea17ecfce37e895c0af5 /test/unit
parent2f23c707133cec88c63375acc0c33b7054d512c6 (diff)
downloadredmine-a3eb6bf1f7d7b7c34ce703f35c0e045ea722a6fc.tar.gz
redmine-a3eb6bf1f7d7b7c34ce703f35c0e045ea722a6fc.zip
Merged r16738 (#26310, #25988).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16739 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/unit')
-rw-r--r--test/unit/helpers/application_helper_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index ca56412f7..020b4636c 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -667,7 +667,7 @@ RAW
def test_attachment_links
text = 'attachment:error281.txt'
- result = link_to("error281.txt", "/attachments/download/1/error281.txt",
+ result = link_to("error281.txt", "/attachments/1/error281.txt",
:class => "attachment")
assert_equal "<p>#{result}</p>",
textilizable(text,
@@ -679,7 +679,7 @@ RAW
set_tmp_attachments_directory
a1 = Attachment.generate!(:filename => "test.txt", :created_on => 1.hour.ago)
a2 = Attachment.generate!(:filename => "test.txt")
- result = link_to("test.txt", "/attachments/download/#{a2.id}/test.txt",
+ result = link_to("test.txt", "/attachments/#{a2.id}/test.txt",
:class => "attachment")
assert_equal "<p>#{result}</p>",
textilizable('attachment:test.txt', :attachments => [a1, a2])