jro_apps/redmine Commit - r11926:5aa8358f97d2

scm: fix annotate error with non ASCII author on Ruby 1.9 and Ruby 2.0 (#14931)...

Toshi MARUYAMA -

r11926:5aa8358f97d2

parent child

Context file:

r11926:5aa8358f97d2

Collapse all files

app/views/repositories/annotate.html.erb +3 -1

             <%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
             <div class="contextual">
               <%= render :partial => 'navigation' %>
             </div>
             <h2><%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
             <%= render :partial => 'link_to_functions' %>
             <% colors = Hash.new {|k,v| k[v] = (k.size % 12) } %>
             <div class="autoscroll">
             <table class="filecontent annotate syntaxhl">
               <tbody>
                 <% line_num = 1; previous_revision = nil %>
                 <% syntax_highlight_lines(@path, Redmine::CodesetUtil.to_utf8_by_setting(@annotate.content)).each do |line| %>
                   <% revision = @annotate.revisions[line_num - 1] %>
                   <tr id="L<%= line_num %>" class="bloc-<%= revision.nil? ? 0 : colors[revision.identifier || revision.revision] %>">
                     <th class="line-num"><a href="#L<%= line_num %>"><%= line_num %></a></th>
                     <td class="revision">
                       <% if revision && revision != previous_revision %>
                         <%= revision.identifier ?
                               link_to_revision(revision, @repository) : format_revision(revision) %>
                       <% end %>
                     </td>
                     <td class="author">
                       <% if revision && revision != previous_revision %>
-                        <%= revision.author.to_s.split('<').first %>
+                        <% author = Redmine::CodesetUtil.to_utf8(revision.author.to_s,
+                                                                 @repository.repo_log_encoding) %>
+                        <%= author.split('<').first %>
                       <% end %>
                     </td>
                     <td class="line-code"><pre><%= line.html_safe %></pre></td>
                   </tr>
                   <% line_num += 1; previous_revision = revision %>
                 <% end %>
               </tbody>
             </table>
             </div>
             <% html_title(l(:button_annotate)) -%>
             <% content_for :header_tags do %>
             <%= stylesheet_link_tag 'scm' %>
             <% end %>

test/functional/repositories_bazaar_controller_test.rb +36 0

             # Redmine - project management software
             # Copyright (C) 2006-2013  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 RepositoriesBazaarControllerTest < ActionController::TestCase
               tests RepositoriesController
               fixtures :projects, :users, :roles, :members, :member_roles,
                        :repositories, :enabled_modules
               REPOSITORY_PATH = Rails.root.join('tmp/test/bazaar_repository').to_s
               REPOSITORY_PATH_TRUNK = File.join(REPOSITORY_PATH, "trunk")
               PRJ_ID = 3
+              CHAR_1_UTF8_HEX   = "\xc3\x9c"
               def setup
                 User.current = nil
                 @project = Project.find(PRJ_ID)
                 @repository = Repository::Bazaar.create(
                                 :project      => @project,
                                 :url          => REPOSITORY_PATH_TRUNK,
                                 :log_encoding => 'UTF-8')
                 assert @repository
+                @char_1_utf8 = CHAR_1_UTF8_HEX.dup
+                if @char_1_utf8.respond_to?(:force_encoding)
+                  @char_1_utf8.force_encoding('UTF-8')
+                end
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_get_new
                   @request.session[:user_id] = 1
                   @project.repository.destroy
                   get :new, :project_id => 'subproject1', :repository_scm => 'Bazaar'
                   assert_response :success
                   assert_template 'new'
                   assert_kind_of Repository::Bazaar, assigns(:repository)
                   assert assigns(:repository).new_record?
                 end
                 def test_browse_root
                   get :show, :id => PRJ_ID
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal 2, assigns(:entries).size
                   assert assigns(:entries).detect {|e| e.name == 'directory' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'doc-mkdir.txt' && e.kind == 'file'}
                 end
                 def test_browse_directory
                   get :show, :id => PRJ_ID, :path => repository_path_hash(['directory'])[:param]
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['doc-ls.txt', 'document.txt', '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 'directory/edit.png', entry.path
                 end
                 def test_browse_at_given_revision
                   get :show, :id => PRJ_ID, :path => repository_path_hash([])[:param],
                       :rev => 3
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['directory', 'doc-deleted.txt', 'doc-ls.txt', 'doc-mkdir.txt'],
                                assigns(:entries).collect(&:name)
                 end
                 def test_changes
                   get :changes, :id => PRJ_ID,
                       :path => repository_path_hash(['doc-mkdir.txt'])[:param]
                   assert_response :success
                   assert_template 'changes'
                   assert_tag :tag => 'h2', :content => 'doc-mkdir.txt'
                 end
                 def test_entry_show
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['directory', 'doc-ls.txt'])[:param]
                   assert_response :success
                   assert_template 'entry'
                   # Line 19
                   assert_tag :tag => 'th',
                              :content => /29/,
                              :attributes => { :class => /line-num/ },
                              :sibling => { :tag => 'td', :content => /Show help message/ }
                 end
                 def test_entry_download
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['directory', 'doc-ls.txt'])[:param],
                       :format => 'raw'
                   assert_response :success
                   # File content
                   assert @response.body.include?('Show help message')
                 end
                 def test_directory_entry
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['directory'])[:param]
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entry)
                   assert_equal 'directory', assigns(:entry).name
                 end
                 def test_diff
                   # Full diff of changeset 3
                   ['inline', 'sbs'].each do |dt|
                     get :diff, :id => PRJ_ID, :rev => 3, :type => dt
                     assert_response :success
                     assert_template 'diff'
                     # Line 11 removed
                     assert_tag :tag => 'th',
                                :content => '11',
                                :sibling => { :tag => 'td',
                                              :attributes => { :class => /diff_out/ },
                                              :content => /Display more information/ }
                   end
                 end
                 def test_annotate
                   get :annotate, :id => PRJ_ID,
                       :path => repository_path_hash(['doc-mkdir.txt'])[:param]
                   assert_response :success
                   assert_template 'annotate'
                   assert_select "th.line-num", :text => '2' do
                     assert_select "+ td.revision" do
                       assert_select "a", :text => '3'
                       assert_select "+ td.author", :text => "jsmith@" do
                         assert_select "+ td",
                                       :text => "Main purpose:"
                       end
                     end
                   end
                 end
                 def test_annotate_author_escaping
                   repository = Repository::Bazaar.create(
                                 :project      => @project,
                                 :url          => File.join(REPOSITORY_PATH, "author_escaping"),
                                 :identifier => 'author_escaping',
                                 :log_encoding => 'UTF-8')
                   assert repository
                   get :annotate, :id => PRJ_ID, :repository_id => 'author_escaping',
                       :path => repository_path_hash(['author-escaping-test.txt'])[:param]
                   assert_response :success
                   assert_template 'annotate'
                   assert_select "th.line-num", :text => '1' do
                     assert_select "+ td.revision" do
                       assert_select "a", :text => '2'
                       assert_select "+ td.author", :text => "test &amp;" do
                         assert_select "+ td",
                                       :text => "author escaping test"
                       end
                     end
                   end
                 end
+                if REPOSITORY_PATH.respond_to?(:force_encoding)
+                  def test_annotate_author_non_ascii
+                    log_encoding = nil
+                    if Encoding.locale_charmap == "UTF-8" ||
+                         Encoding.locale_charmap == "ISO-8859-1"
+                      log_encoding = Encoding.locale_charmap
+                    end
+                    unless log_encoding.nil?
+                      repository = Repository::Bazaar.create(
+                                    :project      => @project,
+                                    :url          => File.join(REPOSITORY_PATH, "author_non_ascii"),
+                                    :identifier => 'author_non_ascii',
+                                    :log_encoding => log_encoding)
+                      assert repository
+                      get :annotate, :id => PRJ_ID, :repository_id => 'author_non_ascii',
+                          :path => repository_path_hash(['author-non-ascii-test.txt'])[:param]
+                      assert_response :success
+                      assert_template 'annotate'
+                      assert_select "th.line-num", :text => '1' do
+                        assert_select "+ td.revision" do
+                          assert_select "a", :text => '2'
+                          assert_select "+ td.author", :text => "test #{@char_1_utf8}" do
+                            assert_select "+ td",
+                                          :text => "author non ASCII test"
+                          end
+                        end
+                      end
+                    end
+                  end
+                end
                 def test_destroy_valid_repository
                   @request.session[:user_id] = 1 # admin
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   assert @repository.changesets.count > 0
                   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::Bazaar.create!(
                                 :project      => @project,
                                 :url          => "/invalid",
                                 :log_encoding => 'UTF-8')
                   @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
               else
                 puts "Bazaar test repository NOT FOUND. Skipping functional tests !!!"
                 def test_fake; assert true end
               end
             end

test/functional/repositories_git_controller_test.rb +20 0

             # Redmine - project management software
             # Copyright (C) 2006-2013  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"
+              FELIX_HEX  = "Felix Sch\xC3\xA4fer"
               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
+                @felix_utf8  = FELIX_HEX.dup
                 if @char_1.respond_to?(:force_encoding)
                   @char_1.force_encoding('UTF-8')
+                  @felix_utf8.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'
                              }
                 assert_response 302
                 repo2 = Repository.find(repository.id)
                 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 true, @repository.is_default
                   assert_nil @repository.identifier
                   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/
                     assert_tag :tag => "form",
                                :attributes => {
                                  :action => "/projects/subproject1/repository/revisions/" +
                                                "61b685fbe55ab05b5ac68402d5720c1a6ac973d1/diff"
                                }
                     assert_tag :tag => 'input',
                                :attributes => {
                                  :id => "rev_to",
                                  :name => "rev_to",
                                  :type => "hidden",
                                  :value => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
                                }
                   end
                 end
                 def test_diff_path_in_subrepo
                   repo = Repository::Git.create(
                                   :project       => @project,
                                   :url           => REPOSITORY_PATH,
                                   :identifier => 'test-diff-path',
                                   :path_encoding => 'ISO-8859-1'
                                   );
                   assert repo
                   assert_equal false, repo.is_default
                   assert_equal 'test-diff-path', repo.identifier
                   get :diff,
                       :id     => PRJ_ID,
                       :repository_id => 'test-diff-path',
                       :rev    => '61b685fbe55ab05b',
                       :rev_to => '2f9c0091c754a91a',
                       :type   => 'inline'
                   assert_response :success
                   assert_template 'diff'
                   diff = assigns(:diff)
                   assert_not_nil diff
                   assert_tag :tag => "form",
                              :attributes => {
                                :action => "/projects/subproject1/repository/test-diff-path/" +
                                             "revisions/61b685fbe55ab05b/diff"
                              }
                   assert_tag :tag => 'input',
                              :attributes => {
                                :id => "rev_to",
                                :name => "rev_to",
                                :type => "hidden",
                                :value => '2f9c0091c754a91a'
                              }
                 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_diff_should_show_filenames
                   get :diff, :id => PRJ_ID, :rev => 'deff712f05a90d96edbd70facc47d944be5897e3', :type => 'inline'
                   assert_response :success
                   assert_template 'diff'
                   # modified file
                   assert_select 'th.filename', :text => 'sources/watchers_controller.rb'
                   # deleted file
                   assert_select 'th.filename', :text => 'test.txt'
                 end
                 def test_save_diff_type
                   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 23, changeset 2f9c0091
                   assert_select 'tr' do
                     assert_select 'th.line-num', :text => '23'
                     assert_select 'td.revision', :text => /2f9c0091/
                     assert_select 'td.author', :text => 'jsmith'
                     assert_select 'td', :text => /remove_watcher/
                   end
                 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_select "th.line-num", :text => '1' do
                           assert_select "+ td.revision" do
                             assert_select "a", :text => '57ca437c'
                             assert_select "+ td.author", :text => "jsmith" do
                               assert_select "+ td",
                                             :text => "test-#{@char_1}.txt"
                             end
                           end
                         end
                       end
                     end
                   end
                 end
+                def test_annotate_latin_1_author
+                  ['83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', '83ca5fd546063a'].each do |r1|
+                    get :annotate, :id => PRJ_ID,
+                        :path => repository_path_hash([" filename with a leading space.txt "])[:param],
+                        :rev => r1
+                    assert_select "th.line-num", :text => '1' do
+                      assert_select "+ td.revision" do
+                        assert_select "a", :text => '83ca5fd5'
+                        assert_select "+ td.author", :text => @felix_utf8 do
+                          assert_select "+ td",
+                                        :text => "And this is a file with a leading and trailing space..."
+                        end
+                      end
+                    end
+                  end
+                end
                 def test_revisions
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :revisions, :id => PRJ_ID
                   assert_response :success
                   assert_template 'revisions'
                   assert_tag :tag => 'form',
                              :attributes => {
                                :method => 'get',
                                :action => '/projects/subproject1/repository/revision'
                              }
                 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