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

                     </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>

test/functional/repositories_bazaar_controller_test.rb +36 0

@@ -26,6 +26,7 class RepositoriesBazaarControllerTest < ActionController::TestCase
26	REPOSITORY_PATH = Rails.root.join('tmp/test/bazaar_repository').to_s	26	REPOSITORY_PATH = Rails.root.join('tmp/test/bazaar_repository').to_s
27	REPOSITORY_PATH_TRUNK = File.join(REPOSITORY_PATH, "trunk")	27	REPOSITORY_PATH_TRUNK = File.join(REPOSITORY_PATH, "trunk")
28	PRJ_ID = 3	28	PRJ_ID = 3
		29	CHAR_1_UTF8_HEX = "\xc3\x9c"
29		30
30	def setup	31	def setup
31	User.current = nil	32	User.current = nil
@@ -35,6 +36,10 class RepositoriesBazaarControllerTest < ActionController::TestCase
35	:url => REPOSITORY_PATH_TRUNK,	36	:url => REPOSITORY_PATH_TRUNK,
36	:log_encoding => 'UTF-8')	37	:log_encoding => 'UTF-8')
37	assert @repository	38	assert @repository
		39	@char_1_utf8 = CHAR_1_UTF8_HEX.dup
		40	if @char_1_utf8.respond_to?(:force_encoding)
		41	@char_1_utf8.force_encoding('UTF-8')
		42	end
38	end	43	end
39		44
40	if File.directory?(REPOSITORY_PATH)	45	if File.directory?(REPOSITORY_PATH)
@@ -171,6 +176,37 class RepositoriesBazaarControllerTest < ActionController::TestCase
171	end	176	end
172	end	177	end
173		178
		179	if REPOSITORY_PATH.respond_to?(:force_encoding)
		180	def test_annotate_author_non_ascii
		181	log_encoding = nil
		182	if Encoding.locale_charmap == "UTF-8" \|\|
		183	Encoding.locale_charmap == "ISO-8859-1"
		184	log_encoding = Encoding.locale_charmap
		185	end
		186	unless log_encoding.nil?
		187	repository = Repository::Bazaar.create(
		188	:project => @project,
		189	:url => File.join(REPOSITORY_PATH, "author_non_ascii"),
		190	:identifier => 'author_non_ascii',
		191	:log_encoding => log_encoding)
		192	assert repository
		193	get :annotate, :id => PRJ_ID, :repository_id => 'author_non_ascii',
		194	:path => repository_path_hash(['author-non-ascii-test.txt'])[:param]
		195	assert_response :success
		196	assert_template 'annotate'
		197	assert_select "th.line-num", :text => '1' do
		198	assert_select "+ td.revision" do
		199	assert_select "a", :text => '2'
		200	assert_select "+ td.author", :text => "test #{@char_1_utf8}" do
		201	assert_select "+ td",
		202	:text => "author non ASCII test"
		203	end
		204	end
		205	end
		206	end
		207	end
		208	end
		209
174	def test_destroy_valid_repository	210	def test_destroy_valid_repository
175	@request.session[:user_id] = 1 # admin	211	@request.session[:user_id] = 1 # admin
176	assert_equal 0, @repository.changesets.count	212	assert_equal 0, @repository.changesets.count

test/functional/repositories_git_controller_test.rb +20 0

               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.
                                   )
                 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
                   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

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