Respond with 404 instead of 500 when revision/entry is not found in the repository...

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4710 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 3e4584eadedffe49890af183c379c68af3d12185..72104d575063f0f5b3edd3fdd8bdb85c94c18c1e 100644 (file)
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -226,7 +226,7 @@ class RepositoriesController < ApplicationController
   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

diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb
index e08c41b485aa44ef82a4d2d3cb5a27bc17c2f17e..53b5ea7ccef7612880d36a83f59079f0f2fec262 100644 (file)
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -192,7 +192,7 @@ class RepositoriesGitControllerTest < ActionController::TestCase
       @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

diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb
index b565863c30fa4bff1de9d30c865e79345f0c786a..de382bbbf15f70f3db10d9c6c7145ca6469d57a1 100644 (file)
--- a/test/functional/repositories_mercurial_controller_test.rb
+++ b/test/functional/repositories_mercurial_controller_test.rb
@@ -201,7 +201,7 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase
       @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

diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb
index 5478cee2724ddb278065189981059fb96e660ef1..1a13797d82b7ec8e9026cb3b14c7120759384d6a 100644 (file)
--- a/test/functional/repositories_subversion_controller_test.rb
+++ b/test/functional/repositories_subversion_controller_test.rb
@@ -168,14 +168,14 @@ class RepositoriesSubversionControllerTest < ActionController::TestCase
     
     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