summaryrefslogtreecommitdiffstats
path: root/test/functional/repositories_git_controller_test.rb
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-09-01 02:23:29 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-09-01 02:23:29 +0000
commit3581782ec2a46ca19058b4189ce6fcc8d62bc145 (patch)
treeabb6cbe47f3d7eea6cb3890d81752f45ad599d67 /test/functional/repositories_git_controller_test.rb
parent8d4c0e5ecdb91721da7caf433fe388ae89692f2b (diff)
downloadredmine-3581782ec2a46ca19058b4189ce6fcc8d62bc145.tar.gz
redmine-3581782ec2a46ca19058b4189ce6fcc8d62bc145.zip
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
Diffstat (limited to 'test/functional/repositories_git_controller_test.rb')
-rw-r--r--test/functional/repositories_git_controller_test.rb34
1 files 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