diff test/functional/attachments_controller_test.rb @ 511:107d36338b70 live

Merge from branch "cannam"

--- a/test/functional/attachments_controller_test.rb	Thu Jun 09 16:51:06 2011 +0100
+++ b/test/functional/attachments_controller_test.rb	Thu Jul 14 10:43:07 2011 +0100
@@ -1,21 +1,23 @@
-# redMine - project management software
-# Copyright (C) 2006-2008  Jean-Philippe Lang
+# encoding: utf-8
+#
+# Redmine - project management software
+# Copyright (C) 2006-2011  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'
+require File.expand_path('../../test_helper', __FILE__)
 require 'attachments_controller'
 
 # Re-raise errors caught by the controller.
@@ -25,7 +27,7 @@
 class AttachmentsControllerTest < ActionController::TestCase
   fixtures :users, :projects, :roles, :members, :member_roles, :enabled_modules, :issues, :trackers, :attachments,
            :versions, :wiki_pages, :wikis, :documents
-  
+
   def setup
     @controller = AttachmentsController.new
     @request    = ActionController::TestRequest.new
@@ -33,64 +35,97 @@
     Attachment.storage_path = "#{RAILS_ROOT}/test/fixtures/files"
     User.current = nil
   end
-  
+
   def test_show_diff
-    get :show, :id => 5
+    get :show, :id => 14 # 060719210727_changeset_utf8.diff
     assert_response :success
     assert_template 'diff'
     assert_equal 'text/html', @response.content_type
+
+    assert_tag 'th',
+      :attributes => {:class => /filename/},
+      :content => /issues_controller.rb\t\(révision 1484\)/
+    assert_tag 'td',
+      :attributes => {:class => /line-code/},
+      :content => /Demande créée avec succès/
   end
-  
+
+  def test_show_diff_should_strip_non_utf8_content
+    get :show, :id => 5 # 060719210727_changeset_iso8859-1.diff
+    assert_response :success
+    assert_template 'diff'
+    assert_equal 'text/html', @response.content_type
+
+    assert_tag 'th',
+      :attributes => {:class => /filename/},
+      :content => /issues_controller.rb\t\(rvision 1484\)/
+    assert_tag 'td',
+      :attributes => {:class => /line-code/},
+      :content => /Demande cre avec succs/
+  end
+
   def test_show_text_file
     get :show, :id => 4
     assert_response :success
     assert_template 'file'
     assert_equal 'text/html', @response.content_type
   end
-  
+
   def test_show_text_file_should_send_if_too_big
     Setting.file_max_size_displayed = 512
     Attachment.find(4).update_attribute :filesize, 754.kilobyte
-    
+
     get :show, :id => 4
     assert_response :success
     assert_equal 'application/x-ruby', @response.content_type
   end
-  
+
   def test_show_other
     get :show, :id => 6
     assert_response :success
     assert_equal 'application/octet-stream', @response.content_type
   end
-  
+
+  def test_show_file_from_private_issue_without_permission
+    get :show, :id => 15
+    assert_redirected_to '/login?back_url=http%3A%2F%2Ftest.host%2Fattachments%2F15'
+  end
+
+  def test_show_file_from_private_issue_with_permission
+    @request.session[:user_id] = 2
+    get :show, :id => 15
+    assert_response :success
+    assert_tag 'h2', :content => /private.diff/
+  end
+
   def test_download_text_file
     get :download, :id => 4
     assert_response :success
     assert_equal 'application/x-ruby', @response.content_type
   end
-  
+
   def test_download_should_assign_content_type_if_blank
     Attachment.find(4).update_attribute(:content_type, '')
-    
+
     get :download, :id => 4
     assert_response :success
     assert_equal 'text/x-ruby', @response.content_type
   end
-  
+
   def test_download_missing_file
     get :download, :id => 2
     assert_response 404
   end
-  
+
   def test_anonymous_on_private_private
     get :download, :id => 7
     assert_redirected_to '/login?back_url=http%3A%2F%2Ftest.host%2Fattachments%2Fdownload%2F7'
   end
-  
+
   def test_destroy_issue_attachment
     issue = Issue.find(3)
     @request.session[:user_id] = 2
-    
+
     assert_difference 'issue.attachments.count', -1 do
       post :destroy, :id => 1
     end
@@ -102,7 +137,7 @@
     assert_equal '1', j.details.first.prop_key
     assert_equal 'error281.txt', j.details.first.old_value
   end
-  
+
   def test_destroy_wiki_page_attachment
     @request.session[:user_id] = 2
     assert_difference 'Attachment.count', -1 do
@@ -110,7 +145,7 @@
       assert_response 302
     end
   end
-  
+
   def test_destroy_project_attachment
     @request.session[:user_id] = 2
     assert_difference 'Attachment.count', -1 do
@@ -118,7 +153,7 @@
       assert_response 302
     end
   end
-  
+
   def test_destroy_version_attachment
     @request.session[:user_id] = 2
     assert_difference 'Attachment.count', -1 do
@@ -126,7 +161,7 @@
       assert_response 302
     end
   end
-  
+
   def test_destroy_without_permission
     post :destroy, :id => 3
     assert_redirected_to '/login?back_url=http%3A%2F%2Ftest.host%2Fattachments%2Fdestroy%2F3'