summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2009-05-26 08:28:36 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2009-05-26 08:28:36 +0000
commitc082cfc90ef8fccc77e808ae64db711777fd8f8c (patch)
tree0ebcd1502964ad4b607bf860899f74cdcf02b23e /test
parent5db407ca59cd63282837097957db3961b6e63fc0 (diff)
downloadredmine-c082cfc90ef8fccc77e808ae64db711777fd8f8c.tar.gz
redmine-c082cfc90ef8fccc77e808ae64db711777fd8f8c.zip
FIxed: inline images not displayed in atom feeds (#3391).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2768 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test')
-rw-r--r--test/fixtures/attachments.yml12
-rw-r--r--test/fixtures/journals.yml7
-rw-r--r--test/functional/issues_controller_test.rb8
3 files changed, 27 insertions, 0 deletions
diff --git a/test/fixtures/attachments.yml b/test/fixtures/attachments.yml
index 2497bd9a3..94c118f9e 100644
--- a/test/fixtures/attachments.yml
+++ b/test/fixtures/attachments.yml
@@ -109,4 +109,16 @@ attachments_009:
filename: version_file.zip
author_id: 2
content_type: application/octet-stream
+attachments_010:
+ created_on: 2006-07-19 21:07:27 +02:00
+ container_type: Issue
+ container_id: 2
+ downloads: 0
+ disk_filename: 060719210727_picture.jpg
+ digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
+ id: 10
+ filesize: 452
+ filename: picture.jpg
+ author_id: 2
+ content_type: image/jpeg
\ No newline at end of file
diff --git a/test/fixtures/journals.yml b/test/fixtures/journals.yml
index 70aa5da73..3ee66ae6b 100644
--- a/test/fixtures/journals.yml
+++ b/test/fixtures/journals.yml
@@ -13,4 +13,11 @@ journals_002:
journalized_type: Issue
user_id: 2
journalized_id: 1
+journals_003:
+ created_on: <%= 1.days.ago.to_date.to_s(:db) %>
+ notes: "A comment with inline image: !picture.jpg!"
+ id: 3
+ journalized_type: Issue
+ user_id: 2
+ journalized_id: 2
\ No newline at end of file
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index ff132669d..4b5c2d343 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -369,6 +369,14 @@ class IssuesControllerTest < Test::Unit::TestCase
:descendant => { :tag => 'a', :content => /#4$/ }
end
+ def test_show_atom
+ get :show, :id => 2, :format => 'atom'
+ assert_response :success
+ assert_template 'changes.rxml'
+ # Inline image
+ assert @response.body.include?("&lt;img src=\"http://test.host/attachments/download/10\" alt=\"\" /&gt;")
+ end
+
def test_new_routing
assert_routing(
{:method => :get, :path => '/projects/1/issues/new'},