diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-07-17 09:22:42 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-07-17 09:22:42 +0000 |
commit | 1db54e228d98d20536133bf52a8af0ce67616dc3 (patch) | |
tree | 31bfae0406bc57a74e6a10dffbe4abb90d6a7b6d /test/functional/repositories_git_controller_test.rb | |
parent | f165bbd0d7196f7f74a7e5ceb66f2726a9781ba7 (diff) | |
download | redmine-1db54e228d98d20536133bf52a8af0ce67616dc3.tar.gz redmine-1db54e228d98d20536133bf52a8af0ce67616dc3.zip |
Don't respond with the error template when annotate is not available.
git-svn-id: http://svn.redmine.org/redmine/trunk@15694 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional/repositories_git_controller_test.rb')
-rw-r--r-- | test/functional/repositories_git_controller_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb index 4ec419c53..4c2939e35 100644 --- a/test/functional/repositories_git_controller_test.rb +++ b/test/functional/repositories_git_controller_test.rb @@ -449,7 +449,7 @@ class RepositoriesGitControllerTest < Redmine::ControllerTest with_settings :default_language => 'en' do get :annotate, :id => PRJ_ID, :path => repository_path_hash(['images', 'edit.png'])[:param] - assert_response 500 + assert_response 200 assert_select 'p#errorExplanation', :text => /cannot be annotated/ end end @@ -459,7 +459,7 @@ class RepositoriesGitControllerTest < Redmine::ControllerTest get :annotate, :id => PRJ_ID, :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param], :rev => 'deff712f' - assert_response 500 + assert_response 200 assert_select 'p#errorExplanation', :text => /exceeds the maximum text file size/ get :annotate, :id => PRJ_ID, |