From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sat, 1 Sep 2012 07:26:00 +0000 (+0000)
Subject: Merged r10251 from trunk to 2.0-stable (#11752)
X-Git-Tag: 2.0.4~11
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=08ce7df5eafab141895fe1c85a6658a11307ccad;p=redmine.git

Merged r10251 from trunk to 2.0-stable (#11752)

scm: git: use diff_max_lines_displayed setting at test_diff_with_rev_and_path of functional test.

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

diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb
index 753776341..1074e54dc 100644
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -292,22 +292,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