jro_apps/redmine Commit - r4587:b877215261d4

Merged r4703 from trunk (scm: fix error on revision page for empty revision)....

Toshi MARUYAMA -

r4587:b877215261d4

parent child

Context file:

r4587:b877215261d4

app/controllers/repositories_controller.rb +1 0

               end
               def revision
+                raise ChangesetNotFound if @rev.nil? || @rev.empty?
                 @changeset = @repository.find_changeset_by_name(@rev)
                 raise ChangesetNotFound unless @changeset

app/models/repository.rb +1 0

               # Finds and returns a revision with a number or the beginning of a hash
               def find_changeset_by_name(name)
+                return nil if name.nil? || name.empty?
                 changesets.find(:first, :conditions => (name.match(/^\d*$/) ? ["revision = ?", name.to_s] : ["revision LIKE ?", name + '%']))
               end

test/functional/repositories_git_controller_test.rb +20 0

@@ -176,6 +176,26 class RepositoriesGitControllerTest < ActionController::TestCase
176	assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },	176	assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
177	:content => /can not be annotated/	177	:content => /can not be annotated/
178	end	178	end
		179
		180	def test_revision
		181	@repository.fetch_changesets
		182	@repository.reload
		183	['61b685fbe55ab05b5ac68402d5720c1a6ac973d1', '61b685f'].each do \|r\|
		184	get :revision, :id => 3, :rev => r
		185	assert_response :success
		186	assert_template 'revision'
		187	end
		188	end
		189
		190	def test_empty_revision
		191	@repository.fetch_changesets
		192	@repository.reload
		193	['', ' ', nil].each do \|r\|
		194	get :revision, :id => 1, :rev => r
		195	assert_response 500
		196	assert_error_tag :content => /was not found/
		197	end
		198	end
179	else	199	else
180	puts "Git test repository NOT FOUND. Skipping functional tests !!!"	200	puts "Git test repository NOT FOUND. Skipping functional tests !!!"
181	def test_fake; assert true end	201	def test_fake; assert true end

test/functional/repositories_subversion_controller_test.rb +9 -1

@@ -171,7 +171,15 class RepositoriesSubversionControllerTest < ActionController::TestCase
171	assert_response 500	171	assert_response 500
172	assert_error_tag :content => /was not found/	172	assert_error_tag :content => /was not found/
173	end	173	end
174		174
		175	def test_empty_revision
		176	['', ' ', nil].each do \|r\|
		177	get :revision, :id => 1, :rev => r
		178	assert_response 500
		179	assert_error_tag :content => /was not found/
		180	end
		181	end
		182
175	def test_revision_with_repository_pointing_to_a_subdirectory	183	def test_revision_with_repository_pointing_to_a_subdirectory
176	r = Project.find(1).repository	184	r = Project.find(1).repository
177	# Changes repository url to a subdirectory	185	# Changes repository url to a subdirectory

test/unit/repository_git_test.rb +17 0

@@ -63,6 +63,23 class RepositoryGitTest < ActiveSupport::TestCase
63	assert_equal 15, @repository.changesets.count	63	assert_equal 15, @repository.changesets.count
64	end	64	end
65		65
		66	def test_find_changeset_by_name
		67	@repository.fetch_changesets
		68	@repository.reload
		69	['7234cb2750b63f47bff735edc50a1c0a433c2518', '7234cb2750b'].each do \|r\|
		70	assert_equal '7234cb2750b63f47bff735edc50a1c0a433c2518',
		71	@repository.find_changeset_by_name(r).revision
		72	end
		73	end
		74
		75	def test_find_changeset_by_empty_name
		76	@repository.fetch_changesets
		77	@repository.reload
		78	['', ' ', nil].each do \|r\|
		79	assert_nil @repository.find_changeset_by_name(r)
		80	end
		81	end
		82
66	def test_identifier	83	def test_identifier
67	@repository.fetch_changesets	84	@repository.fetch_changesets
68	@repository.reload	85	@repository.reload

test/unit/repository_subversion_test.rb +8 0

                   assert_equal c.revision, c.identifier
                 end
+                def test_find_changeset_by_empty_name
+                  @repository.fetch_changesets
+                  @repository.reload
+                  ['', ' ', nil].each do |r|
+                    assert_nil @repository.find_changeset_by_name(r)
+                  end
+                end
                 def test_identifier_nine_digit
                   c = Changeset.new(:repository => @repository, :committed_on => Time.now,
                                     :revision => '123456789', :comments => 'test')

General Comments 0

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

No TODOs yet

	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