diff test/functional/attachments_controller_test.rb @ 909:cbb26bc654de redmine-1.3

Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)

--- a/test/functional/attachments_controller_test.rb	Fri Feb 24 18:36:29 2012 +0000
+++ b/test/functional/attachments_controller_test.rb	Fri Feb 24 19:09:32 2012 +0000
@@ -23,45 +23,87 @@
 # Re-raise errors caught by the controller.
 class AttachmentsController; def rescue_action(e) raise e end; end
 
-
 class AttachmentsControllerTest < ActionController::TestCase
-  fixtures :users, :projects, :roles, :members, :member_roles, :enabled_modules, :issues, :trackers, :attachments,
+  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
     @response   = ActionController::TestResponse.new
-    Attachment.storage_path = "#{RAILS_ROOT}/test/fixtures/files"
+    Attachment.storage_path = "#{Rails.root}/test/fixtures/files"
     User.current = nil
   end
 
   def test_show_diff
-    get :show, :id => 14 # 060719210727_changeset_utf8.diff
+    ['inline', 'sbs'].each do |dt|
+      # 060719210727_changeset_utf8.diff
+      get :show, :id => 14, :type => dt
+      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
+    set_tmp_attachments_directory
+  end
+
+  def test_show_diff_replcace_cannot_convert_content
+    with_settings :repositories_encodings => 'UTF-8' do
+      ['inline', 'sbs'].each do |dt|
+        # 060719210727_changeset_iso8859-1.diff
+        get :show, :id => 5, :type => dt
+        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
+    end
+    set_tmp_attachments_directory
+  end
+
+  def test_show_diff_latin_1
+    with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
+      ['inline', 'sbs'].each do |dt|
+        # 060719210727_changeset_iso8859-1.diff
+        get :show, :id => 5, :type => dt
+        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
+    end
+    set_tmp_attachments_directory
+  end
+
+  def test_save_diff_type
+    @request.session[:user_id] = 1 # admin
+    user = User.find(1)
+    get :show, :id => 5
     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
+    user.reload
+    assert_equal "inline", user.pref[:diff_type]
+    get :show, :id => 5, :type => 'sbs'
     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/
+    user.reload
+    assert_equal "sbs", user.pref[:diff_type]
   end
 
   def test_show_text_file
@@ -69,6 +111,68 @@
     assert_response :success
     assert_template 'file'
     assert_equal 'text/html', @response.content_type
+    set_tmp_attachments_directory
+  end
+
+  def test_show_text_file_utf_8
+    set_tmp_attachments_directory
+    a = Attachment.new(:container => Issue.find(1),
+                       :file => uploaded_test_file("japanese-utf-8.txt", "text/plain"),
+                       :author => User.find(1))
+    assert a.save
+    assert_equal 'japanese-utf-8.txt', a.filename
+
+    str_japanese = "\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e"
+    str_japanese.force_encoding('UTF-8') if str_japanese.respond_to?(:force_encoding)
+
+    get :show, :id => a.id
+    assert_response :success
+    assert_template 'file'
+    assert_equal 'text/html', @response.content_type
+    assert_tag :tag => 'th',
+               :content => '1',
+               :attributes => { :class => 'line-num' },
+               :sibling => { :tag => 'td', :content => /#{str_japanese}/ }
+  end
+
+  def test_show_text_file_replcace_cannot_convert_content
+    set_tmp_attachments_directory
+    with_settings :repositories_encodings => 'UTF-8' do
+      a = Attachment.new(:container => Issue.find(1),
+                         :file => uploaded_test_file("iso8859-1.txt", "text/plain"),
+                         :author => User.find(1))
+      assert a.save
+      assert_equal 'iso8859-1.txt', a.filename
+
+      get :show, :id => a.id
+      assert_response :success
+      assert_template 'file'
+      assert_equal 'text/html', @response.content_type
+      assert_tag :tag => 'th',
+                 :content => '7',
+                 :attributes => { :class => 'line-num' },
+                 :sibling => { :tag => 'td', :content => /Demande cr\?\?e avec succ\?s/ }
+    end
+  end
+
+  def test_show_text_file_latin_1
+    set_tmp_attachments_directory
+    with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
+      a = Attachment.new(:container => Issue.find(1),
+                         :file => uploaded_test_file("iso8859-1.txt", "text/plain"),
+                         :author => User.find(1))
+      assert a.save
+      assert_equal 'iso8859-1.txt', a.filename
+
+      get :show, :id => a.id
+      assert_response :success
+      assert_template 'file'
+      assert_equal 'text/html', @response.content_type
+      assert_tag :tag => 'th',
+                 :content => '7',
+                 :attributes => { :class => 'line-num' },
+                 :sibling => { :tag => 'td', :content => /Demande créée avec succès/ }
+      end
   end
 
   def test_show_text_file_should_send_if_too_big
@@ -78,17 +182,20 @@
     get :show, :id => 4
     assert_response :success
     assert_equal 'application/x-ruby', @response.content_type
+    set_tmp_attachments_directory
   end
 
   def test_show_other
     get :show, :id => 6
     assert_response :success
     assert_equal 'application/octet-stream', @response.content_type
+    set_tmp_attachments_directory
   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'
+    set_tmp_attachments_directory
   end
 
   def test_show_file_from_private_issue_with_permission
@@ -96,12 +203,20 @@
     get :show, :id => 15
     assert_response :success
     assert_tag 'h2', :content => /private.diff/
+    set_tmp_attachments_directory
   end
 
   def test_download_text_file
     get :download, :id => 4
     assert_response :success
     assert_equal 'application/x-ruby', @response.content_type
+    set_tmp_attachments_directory
+  end
+
+  def test_download_version_file_with_issue_tracking_disabled
+    Project.find(1).disable_module! :issue_tracking
+    get :download, :id => 9
+    assert_response :success
   end
 
   def test_download_should_assign_content_type_if_blank
@@ -110,24 +225,28 @@
     get :download, :id => 4
     assert_response :success
     assert_equal 'text/x-ruby', @response.content_type
+    set_tmp_attachments_directory
   end
 
   def test_download_missing_file
     get :download, :id => 2
     assert_response 404
+    set_tmp_attachments_directory
   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'
+    set_tmp_attachments_directory
   end
 
   def test_destroy_issue_attachment
+    set_tmp_attachments_directory
     issue = Issue.find(3)
     @request.session[:user_id] = 2
 
     assert_difference 'issue.attachments.count', -1 do
-      post :destroy, :id => 1
+      delete :destroy, :id => 1
     end
     # no referrer
     assert_redirected_to '/projects/ecookbook'
@@ -139,32 +258,38 @@
   end
 
   def test_destroy_wiki_page_attachment
+    set_tmp_attachments_directory
     @request.session[:user_id] = 2
     assert_difference 'Attachment.count', -1 do
-      post :destroy, :id => 3
+      delete :destroy, :id => 3
       assert_response 302
     end
   end
 
   def test_destroy_project_attachment
+    set_tmp_attachments_directory
     @request.session[:user_id] = 2
     assert_difference 'Attachment.count', -1 do
-      post :destroy, :id => 8
+      delete :destroy, :id => 8
       assert_response 302
     end
   end
 
   def test_destroy_version_attachment
+    set_tmp_attachments_directory
     @request.session[:user_id] = 2
     assert_difference 'Attachment.count', -1 do
-      post :destroy, :id => 9
+      delete :destroy, :id => 9
       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'
+    set_tmp_attachments_directory
+    assert_no_difference 'Attachment.count' do
+      delete :destroy, :id => 3
+    end
+    assert_response 302
     assert Attachment.find_by_id(3)
   end
 end