diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-09-19 03:02:03 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-09-19 03:02:03 +0000 |
| commit | 551c024b454d5a288b976fa5f2de39e303ddead2 (patch) | |
| tree | 320db9ac9263df7f6aada5505133b528d662cd98 /test | |
| parent | f18edc4e1c045b968cba8d8f905257e63a1c0d5c (diff) | |
| download | redmine-551c024b454d5a288b976fa5f2de39e303ddead2.tar.gz redmine-551c024b454d5a288b976fa5f2de39e303ddead2.zip | |
add functional attachment test of mercurial export file (#11868)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10429 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test')
| -rw-r--r-- | test/fixtures/files/hg-export.diff | 13 | ||||
| -rw-r--r-- | test/functional/attachments_controller_test.rb | 15 |
2 files changed, 28 insertions, 0 deletions
diff --git a/test/fixtures/files/hg-export.diff b/test/fixtures/files/hg-export.diff new file mode 100644 index 000000000..596617fc9 --- /dev/null +++ b/test/fixtures/files/hg-export.diff @@ -0,0 +1,13 @@ +# HG changeset patch +# User test +# Date 1348014182 -32400 +# Node ID d1c871b8ef113df7f1c56d41e6e3bfbaff976e1f +# Parent 180b6605936cdc7909c5f08b59746ec1a7c99b3e +modify test1.txt + +diff -r 180b6605936c -r d1c871b8ef11 test1.txt +--- a/test1.txt ++++ b/test1.txt +@@ -1,1 +1,1 @@ +-test1 ++modify test1 diff --git a/test/functional/attachments_controller_test.rb b/test/functional/attachments_controller_test.rb index 11c3faa95..bc37c3181 100644 --- a/test/functional/attachments_controller_test.rb +++ b/test/functional/attachments_controller_test.rb @@ -110,6 +110,21 @@ class AttachmentsControllerTest < ActionController::TestCase assert_equal "sbs", user.pref[:diff_type] end + def test_diff_show_filename_in_mercurial_export + set_tmp_attachments_directory + a = Attachment.new(:container => Issue.find(1), + :file => uploaded_test_file("hg-export.diff", "text/plain"), + :author => User.find(1)) + assert a.save + assert_equal 'hg-export.diff', a.filename + + get :show, :id => a.id, :type => 'inline' + assert_response :success + assert_template 'diff' + assert_equal 'text/html', @response.content_type + assert_select 'th.filename', :text => 'test1.txt' + end + def test_show_text_file get :show, :id => 4 assert_response :success |