Merged r4710 and r4714 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@4716 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index ceaca4efc783947ec8c657bf8102632d2f70a19d..8bd323646a89f9f9f0de6b92205a41585484a77e 100644 (file)
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -225,7 +225,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 b577da87e427343b02ff43d09b0272b53c3a38c6..170e4f8e83a42e122dcba71af065980c0682c8b9 100644 (file)
--- a/test/functional/repositories_mercurial_controller_test.rb
+++ b/test/functional/repositories_mercurial_controller_test.rb
@@ -32,9 +32,10 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase
     @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
@@ -164,6 +165,16 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase
                  :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

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