From 3581782ec2a46ca19058b4189ce6fcc8d62bc145 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sat, 1 Sep 2012 02:23:29 +0000 Subject: [PATCH] scm: git: use diff_max_lines_displayed setting at test_diff_with_rev_and_path of functional test (#11752) git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10251 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .../repositories_git_controller_test.rb | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb index abb3412ec..795a35af2 100644 --- a/test/functional/repositories_git_controller_test.rb +++ b/test/functional/repositories_git_controller_test.rb @@ -290,22 +290,24 @@ class RepositoriesGitControllerTest < ActionController::TestCase @repository.fetch_changesets @project.reload assert_equal NUM_REV, @repository.changesets.count - # Full diff of changeset 2f9c0091 - ['inline', 'sbs'].each do |dt| - get :diff, - :id => PRJ_ID, - :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7', - :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param], - :type => dt - assert_response :success - assert_template 'diff' - # Line 22 removed - assert_tag :tag => 'th', - :content => '22', - :sibling => { :tag => 'td', - :attributes => { :class => /diff_out/ }, - :content => /def remove/ } - assert_tag :tag => 'h2', :content => /2f9c0091/ + with_settings :diff_max_lines_displayed => 1000 do + # Full diff of changeset 2f9c0091 + ['inline', 'sbs'].each do |dt| + get :diff, + :id => PRJ_ID, + :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7', + :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param], + :type => dt + assert_response :success + assert_template 'diff' + # Line 22 removed + assert_tag :tag => 'th', + :content => '22', + :sibling => { :tag => 'td', + :attributes => { :class => /diff_out/ }, + :content => /def remove/ } + assert_tag :tag => 'h2', :content => /2f9c0091/ + end end end -- 2.39.5