jro_apps/redmine Commit - r4596:6188b9eddba7

Merged r4710 and r4714 from trunk....

Toshi MARUYAMA -

r4596:6188b9eddba7

parent child

Context file:

r4596:6188b9eddba7

app/controllers/repositories_controller.rb +1 -1

               end
               def show_error_not_found
-                render_error l(:error_scm_not_found)
+                render_error :message => l(:error_scm_not_found), :status => 404
               end
               # Handler for Redmine::Scm::Adapters::CommandFailed exception

test/functional/repositories_git_controller_test.rb +1 -1

                   @repository.reload
                   ['', ' ', nil].each do |r|
                     get :revision, :id => 1, :rev => r
-                    assert_response 500
+                    assert_response 404
                     assert_error_tag :content => /was not found/
                   end
                 end

test/functional/repositories_mercurial_controller_test.rb +13 -2

                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
-                Repository::Mercurial.create(:project => Project.find(3), :url => REPOSITORY_PATH)
+                @repository = Repository::Mercurial.create(:project => Project.find(3), :url => REPOSITORY_PATH)
+                assert @repository
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_show
                   get :show, :id => 3
                              :attributes => { :class => 'line-num' },
                              :sibling => { :tag => 'td', :content => /watcher =/ }
                 end
+                def test_empty_revision
+                  @repository.fetch_changesets
+                  @repository.reload
+                  ['', ' ', nil].each do |r|
+                    get :revision, :id => 3, :rev => r
+                    assert_response 404
+                    assert_error_tag :content => /was not found/
+                  end
+                end
               else
                 puts "Mercurial test repository NOT FOUND. Skipping functional tests !!!"
                 def test_fake; assert true end

test/functional/repositories_subversion_controller_test.rb +2 -2

                 def test_invalid_revision
                   get :revision, :id => 1, :rev => 'something_weird'
-                  assert_response 500
+                  assert_response 404
                   assert_error_tag :content => /was not found/
                 end
                 def test_empty_revision
                   ['', ' ', nil].each do |r|
                     get :revision, :id => 1, :rev => r
-                    assert_response 500
+                    assert_response 404
                     assert_error_tag :content => /was not found/
                   end
                 end

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