jro_apps/redmine Commit - r10295:d69cae859f92

Merged r10501 from trunk...

Toshi MARUYAMA -

r10295:d69cae859f92

parent child

Context file:

r10295:d69cae859f92

Collapse all files

test/functional/attachments_controller_test.rb +6 -1

             # 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.expand_path('../../test_helper', __FILE__)
             require 'attachments_controller'
             # 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,
                        :versions, :wiki_pages, :wikis, :documents
               def setup
                 @controller = AttachmentsController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
                 set_fixtures_attachments_directory
               end
               def teardown
                 set_tmp_attachments_directory
               end
               def test_show_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
+                user1 = User.find(1)
+                user1.pref[:diff_type] = nil
+                user1.preference.save
                 user = User.find(1)
+                assert_nil user.pref[:diff_type]
+                @request.session[:user_id] = 1 # admin
                 get :show, :id => 5
                 assert_response :success
                 assert_template 'diff'
                 user.reload
                 assert_equal "inline", user.pref[:diff_type]
                 get :show, :id => 5, :type => 'sbs'
                 assert_response :success
                 assert_template 'diff'
                 user.reload
                 assert_equal "sbs", user.pref[:diff_type]
               end
               def test_show_text_file
                 get :show, :id => 4
                 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
                 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
                 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
                 @request.session[:user_id] = 2
                 get :show, :id => 15
                 assert_response :success
                 assert_tag 'h2', :content => /private.diff/
                 set_tmp_attachments_directory
               end
               def test_show_file_without_container_should_be_denied
                 set_tmp_attachments_directory
                 attachment = Attachment.create!(:file => uploaded_test_file("testfile.txt", "text/plain"), :author_id => 2)
                 @request.session[:user_id] = 2
                 get :show, :id => attachment.id
                 assert_response 403
               end
               def test_show_invalid_should_respond_with_404
                 get :show, :id => 999
                 assert_response 404
               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
                 Attachment.find(4).update_attribute(:content_type, '')
                 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
                   assert_difference 'Journal.count' do
                     delete :destroy, :id => 1
                     assert_redirected_to '/projects/ecookbook'
                   end
                 end
                 assert_nil Attachment.find_by_id(1)
                 j = Journal.first(:order => 'id DESC')
                 assert_equal issue, j.journalized
                 assert_equal 'attachment', j.details.first.property
                 assert_equal '1', j.details.first.prop_key
                 assert_equal 'error281.txt', j.details.first.old_value
                 assert_equal User.find(2), j.user
               end
               def test_destroy_wiki_page_attachment
                 set_tmp_attachments_directory
                 @request.session[:user_id] = 2
                 assert_difference 'Attachment.count', -1 do
                   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
                   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
                   delete :destroy, :id => 9
                   assert_response 302
                 end
               end
               def test_destroy_without_permission
                 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

test/functional/repositories_git_controller_test.rb +6 -1

             # 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.expand_path('../../test_helper', __FILE__)
             class RepositoriesGitControllerTest < ActionController::TestCase
               tests RepositoriesController
               fixtures :projects, :users, :roles, :members, :member_roles,
                        :repositories, :enabled_modules
               REPOSITORY_PATH = Rails.root.join('tmp/test/git_repository').to_s
               REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
               PRJ_ID     = 3
               CHAR_1_HEX = "\xc3\x9c"
               NUM_REV = 28
               ## Git, Mercurial and CVS path encodings are binary.
               ## Subversion supports URL encoding for path.
               ## Redmine Mercurial adapter and extension use URL encoding.
               ## Git accepts only binary path in command line parameter.
               ## So, there is no way to use binary command line parameter in JRuby.
               JRUBY_SKIP     = (RUBY_PLATFORM == 'java')
               JRUBY_SKIP_STR = "TODO: This test fails in JRuby"
               def setup
                 @ruby19_non_utf8_pass =
                   (RUBY_VERSION >= '1.9' && Encoding.default_external.to_s != 'UTF-8')
                 User.current = nil
                 @project    = Project.find(PRJ_ID)
                 @repository = Repository::Git.create(
                                   :project       => @project,
                                   :url           => REPOSITORY_PATH,
                                   :path_encoding => 'ISO-8859-1'
                                   )
                 assert @repository
                 @char_1        = CHAR_1_HEX.dup
                 if @char_1.respond_to?(:force_encoding)
                   @char_1.force_encoding('UTF-8')
                 end
               end
               def test_create_and_update
                 @request.session[:user_id] = 1
                 assert_difference 'Repository.count' do
                   post :create, :project_id => 'subproject1',
                                 :repository_scm => 'Git',
                                 :repository => {
                                    :url => '/test',
                                    :is_default => '0',
                                    :identifier => 'test-create',
                                    :extra_report_last_commit => '1',
                                  }
                 end
                 assert_response 302
                 repository = Repository.first(:order => 'id DESC')
                 assert_kind_of Repository::Git, repository
                 assert_equal '/test', repository.url
                 assert_equal true, repository.extra_report_last_commit
                 put :update, :id => repository.id,
                              :repository => {
                                  :extra_report_last_commit => '0',
                                  :identifier => 'test-update',
                              }
                 assert_response 302
                 repo2 = Repository.find(repository.id)
                 assert_equal 'test-update', repo2.identifier
                 assert_equal false, repo2.extra_report_last_commit
               end
               if File.directory?(REPOSITORY_PATH)
                 ## Ruby uses ANSI api to fork a process on Windows.
                 ## Japanese Shift_JIS and Traditional Chinese Big5 have 0x5c(backslash) problem
                 ## and these are incompatible with ASCII.
                 ## Git for Windows (msysGit) changed internal API from ANSI to Unicode in 1.7.10
                 ## http://code.google.com/p/msysgit/issues/detail?id=80
                 ## So, Latin-1 path tests fail on Japanese Windows
                 WINDOWS_PASS = (Redmine::Platform.mswin? &&
                                      Redmine::Scm::Adapters::GitAdapter.client_version_above?([1, 7, 10]))
                 WINDOWS_SKIP_STR = "TODO: This test fails in Git for Windows above 1.7.10"
                 def test_get_new
                   @request.session[:user_id] = 1
                   @project.repository.destroy
                   get :new, :project_id => 'subproject1', :repository_scm => 'Git'
                   assert_response :success
                   assert_template 'new'
                   assert_kind_of Repository::Git, assigns(:repository)
                   assert assigns(:repository).new_record?
                 end
                 def test_browse_root
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :show, :id => PRJ_ID
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal 9, assigns(:entries).size
                   assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'this_is_a_really_long_and_verbose_directory_name' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
                   assert assigns(:entries).detect {|e| e.name == 'copied_README' && e.kind == 'file'}
                   assert assigns(:entries).detect {|e| e.name == 'new_file.txt' && e.kind == 'file'}
                   assert assigns(:entries).detect {|e| e.name == 'renamed_test.txt' && e.kind == 'file'}
                   assert assigns(:entries).detect {|e| e.name == 'filemane with spaces.txt' && e.kind == 'file'}
                   assert assigns(:entries).detect {|e| e.name == ' filename with a leading space.txt ' && e.kind == 'file'}
                   assert_not_nil assigns(:changesets)
                   assert assigns(:changesets).size > 0
                 end
                 def test_browse_branch
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :show, :id => PRJ_ID, :rev => 'test_branch'
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal 4, assigns(:entries).size
                   assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
                   assert assigns(:entries).detect {|e| e.name == 'test.txt' && e.kind == 'file'}
                   assert_not_nil assigns(:changesets)
                   assert assigns(:changesets).size > 0
                 end
                 def test_browse_tag
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                    [
                     "tag00.lightweight",
                     "tag01.annotated",
                    ].each do |t1|
                     get :show, :id => PRJ_ID, :rev => t1
                     assert_response :success
                     assert_template 'show'
                     assert_not_nil assigns(:entries)
                     assert assigns(:entries).size > 0
                     assert_not_nil assigns(:changesets)
                     assert assigns(:changesets).size > 0
                   end
                 end
                 def test_browse_directory
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :show, :id => PRJ_ID, :path => repository_path_hash(['images'])[:param]
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['edit.png'], assigns(:entries).collect(&:name)
                   entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
                   assert_not_nil entry
                   assert_equal 'file', entry.kind
                   assert_equal 'images/edit.png', entry.path
                   assert_not_nil assigns(:changesets)
                   assert assigns(:changesets).size > 0
                 end
                 def test_browse_at_given_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :show, :id => PRJ_ID, :path => repository_path_hash(['images'])[:param],
                       :rev => '7234cb2750b63f47bff735edc50a1c0a433c2518'
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['delete.png'], assigns(:entries).collect(&:name)
                   assert_not_nil assigns(:changesets)
                   assert assigns(:changesets).size > 0
                 end
                 def test_changes
                   get :changes, :id => PRJ_ID,
                       :path => repository_path_hash(['images', 'edit.png'])[:param]
                   assert_response :success
                   assert_template 'changes'
                   assert_tag :tag => 'h2', :content => 'edit.png'
                 end
                 def test_entry_show
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
                   assert_response :success
                   assert_template 'entry'
                   # Line 19
                   assert_tag :tag => 'th',
                              :content => '11',
                              :attributes => { :class => 'line-num' },
                              :sibling => { :tag => 'td', :content => /WITHOUT ANY WARRANTY/ }
                 end
                 def test_entry_show_latin_1
                   if @ruby19_non_utf8_pass
                     puts_ruby19_non_utf8_pass()
                   elsif WINDOWS_PASS
                     puts WINDOWS_SKIP_STR
                   elsif JRUBY_SKIP
                     puts JRUBY_SKIP_STR
                   else
                     with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
                       ['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
                         get :entry, :id => PRJ_ID,
                             :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}.txt"])[:param],
                             :rev => r1
                         assert_response :success
                         assert_template 'entry'
                         assert_tag :tag => 'th',
                                :content => '1',
                                :attributes => { :class => 'line-num' },
                                :sibling => { :tag => 'td',
                                              :content => /test-#{@char_1}.txt/ }
                       end
                     end
                   end
                 end
                 def test_entry_download
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
                       :format => 'raw'
                   assert_response :success
                   # File content
                   assert @response.body.include?('WITHOUT ANY WARRANTY')
                 end
                 def test_directory_entry
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['sources'])[:param]
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entry)
                   assert_equal 'sources', assigns(:entry).name
                 end
                 def test_diff
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   # Full diff of changeset 2f9c0091
                   ['inline', 'sbs'].each do |dt|
                     get :diff,
                         :id   => PRJ_ID,
                         :rev  => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
                         :type => dt
                     assert_response :success
                     assert_template 'diff'
                     # Line 22 removed
                     assert_tag :tag => 'th',
                                :content => /22/,
                                :sibling => { :tag => 'td',
                                              :attributes => { :class => /diff_out/ },
                                              :content => /def remove/ }
                     assert_tag :tag => 'h2', :content => /2f9c0091/
                   end
                 end
                 def test_diff_with_rev_and_path
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   with_settings :diff_max_lines_displayed => 1000 do
                     # Full diff of changeset 2f9c0091
                     ['inline', 'sbs'].each do |dt|
                       get :diff,
                           :id   => PRJ_ID,
                           :rev  => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
                           :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
                           :type => dt
                       assert_response :success
                       assert_template 'diff'
                       # Line 22 removed
                       assert_tag :tag => 'th',
                                  :content => '22',
                                  :sibling => { :tag => 'td',
                                                :attributes => { :class => /diff_out/ },
                                                :content => /def remove/ }
                       assert_tag :tag => 'h2', :content => /2f9c0091/
                     end
                   end
                 end
                 def test_diff_truncated
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   with_settings :diff_max_lines_displayed => 5 do
                     # Truncated diff of changeset 2f9c0091
                     with_cache do
                       with_settings :default_language => 'en' do
                         get :diff, :id   => PRJ_ID, :type => 'inline',
                             :rev  => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
                         assert_response :success
                         assert @response.body.include?("... This diff was truncated")
                       end
                       with_settings :default_language => 'fr' do
                         get :diff, :id   => PRJ_ID, :type => 'inline',
                             :rev  => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
                         assert_response :success
                         assert ! @response.body.include?("... This diff was truncated")
                         assert @response.body.include?("... Ce diff")
                       end
                     end
                   end
                 end
                 def test_diff_two_revs
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   ['inline', 'sbs'].each do |dt|
                     get :diff,
                         :id     => PRJ_ID,
                         :rev    => '61b685fbe55ab05b5ac68402d5720c1a6ac973d1',
                         :rev_to => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
                         :type   => dt
                     assert_response :success
                     assert_template 'diff'
                     diff = assigns(:diff)
                     assert_not_nil diff
                     assert_tag :tag => 'h2', :content => /2f9c0091:61b685fb/
                   end
                 end
                 def test_diff_latin_1
                   if @ruby19_non_utf8_pass
                     puts_ruby19_non_utf8_pass()
                   else
                     with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
                       ['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
                         ['inline', 'sbs'].each do |dt|
                           get :diff, :id => PRJ_ID, :rev => r1, :type => dt
                           assert_response :success
                           assert_template 'diff'
                           assert_tag :tag => 'thead',
                                      :descendant => {
                                        :tag => 'th',
                                        :attributes => { :class => 'filename' } ,
                                        :content => /latin-1-dir\/test-#{@char_1}.txt/ ,
                                       },
                                      :sibling => {
                                        :tag => 'tbody',
                                        :descendant => {
                                           :tag => 'td',
                                           :attributes => { :class => /diff_in/ },
                                           :content => /test-#{@char_1}.txt/
                                        }
                                      }
                         end
                       end
                     end
                   end
                 end
                 def test_save_diff_type
-                  @request.session[:user_id] = 1 # admin
+                  user1 = User.find(1)
+                  user1.pref[:diff_type] = nil
+                  user1.preference.save
                   user = User.find(1)
+                  assert_nil user.pref[:diff_type]
+                  @request.session[:user_id] = 1 # admin
                   get :diff,
                       :id   => PRJ_ID,
                       :rev  => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
                   assert_response :success
                   assert_template 'diff'
                   user.reload
                   assert_equal "inline", user.pref[:diff_type]
                   get :diff,
                       :id   => PRJ_ID,
                       :rev  => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
                       :type => 'sbs'
                   assert_response :success
                   assert_template 'diff'
                   user.reload
                   assert_equal "sbs", user.pref[:diff_type]
                 end
                 def test_annotate
                   get :annotate, :id => PRJ_ID,
                       :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
                   assert_response :success
                   assert_template 'annotate'
                   # Line 24, changeset 2f9c0091
                   assert_tag :tag => 'th', :content => '24',
                              :sibling => {
                                 :tag => 'td',
                                 :child => {
                                    :tag => 'a',
                                    :content => /2f9c0091/
                                    }
                                 }
                   assert_tag :tag => 'th', :content => '24',
                              :sibling => { :tag => 'td', :content => /jsmith/ }
                   assert_tag :tag => 'th', :content => '24',
                              :sibling => {
                                 :tag => 'td',
                                 :child => {
                                    :tag => 'a',
                                    :content => /2f9c0091/
                                    }
                                 }
                   assert_tag :tag => 'th', :content => '24',
                              :sibling => { :tag => 'td', :content => /watcher =/ }
                 end
                 def test_annotate_at_given_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :annotate, :id => PRJ_ID, :rev => 'deff7',
                       :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
                   assert_response :success
                   assert_template 'annotate'
                   assert_tag :tag => 'h2', :content => /@ deff712f/
                 end
                 def test_annotate_binary_file
                   get :annotate, :id => PRJ_ID,
                       :path => repository_path_hash(['images', 'edit.png'])[:param]
                   assert_response 500
                   assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
                                           :content => /cannot be annotated/
                 end
                 def test_annotate_error_when_too_big
                   with_settings :file_max_size_displayed => 1 do
                     get :annotate, :id => PRJ_ID,
                         :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
                         :rev => 'deff712f'
                     assert_response 500
                     assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
                                             :content => /exceeds the maximum text file size/
                     get :annotate, :id => PRJ_ID,
                         :path => repository_path_hash(['README'])[:param],
                         :rev => '7234cb2'
                     assert_response :success
                     assert_template 'annotate'
                   end
                 end
                 def test_annotate_latin_1
                   if @ruby19_non_utf8_pass
                     puts_ruby19_non_utf8_pass()
                   elsif WINDOWS_PASS
                     puts WINDOWS_SKIP_STR
                   elsif JRUBY_SKIP
                     puts JRUBY_SKIP_STR
                   else
                     with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
                       ['57ca437c', '57ca437c0acbbcb749821fdf3726a1367056d364'].each do |r1|
                         get :annotate, :id => PRJ_ID,
                             :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}.txt"])[:param],
                             :rev => r1
                         assert_tag :tag => 'th',
                                    :content => '1',
                                    :attributes => { :class => 'line-num' },
                                    :sibling => { :tag => 'td',
                                                  :content => /test-#{@char_1}.txt/ }
                       end
                     end
                   end
                 end
                 def test_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   ['61b685fbe55ab05b5ac68402d5720c1a6ac973d1', '61b685f'].each do |r|
                     get :revision, :id => PRJ_ID, :rev => r
                     assert_response :success
                     assert_template 'revision'
                   end
                 end
                 def test_empty_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   ['', ' ', nil].each do |r|
                     get :revision, :id => PRJ_ID, :rev => r
                     assert_response 404
                     assert_error_tag :content => /was not found/
                   end
                 end
                 def test_destroy_valid_repository
                   @request.session[:user_id] = 1 # admin
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   assert_difference 'Repository.count', -1 do
                     delete :destroy, :id => @repository.id
                   end
                   assert_response 302
                   @project.reload
                   assert_nil @project.repository
                 end
                 def test_destroy_invalid_repository
                   @request.session[:user_id] = 1 # admin
                   @project.repository.destroy
                   @repository = Repository::Git.create!(
                                   :project       => @project,
                                   :url           => "/invalid",
                                   :path_encoding => 'ISO-8859-1'
                                   )
                   @repository.fetch_changesets
                   @repository.reload
                   assert_equal 0, @repository.changesets.count
                   assert_difference 'Repository.count', -1 do
                     delete :destroy, :id => @repository.id
                   end
                   assert_response 302
                   @project.reload
                   assert_nil @project.repository
                 end
                 private
                 def puts_ruby19_non_utf8_pass
                   puts "TODO: This test fails in Ruby 1.9 " +
                        "and Encoding.default_external is not UTF-8. " +
                        "Current value is '#{Encoding.default_external.to_s}'"
                 end
               else
                 puts "Git test repository NOT FOUND. Skipping functional tests !!!"
                 def test_fake; assert true end
               end
               private
               def with_cache(&block)
                 before = ActionController::Base.perform_caching
                 ActionController::Base.perform_caching = true
                 block.call
                 ActionController::Base.perform_caching = before
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages