From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Mon, 12 Sep 2011 02:56:54 +0000 (+0000)
Subject: Rails3: scm: git: fix error of test_diff_truncated at functional test
X-Git-Tag: 1.3.0~828
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=14386007f51e0e8be5ff82ef62c2ea3f43500a0c;p=redmine.git

Rails3: scm: git: fix error of test_diff_truncated at functional test

On Rails 3.1, ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection error raises.
For more details, see r7062.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7140 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb
index 283873330..702b04abc 100644
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -237,8 +237,10 @@ class RepositoriesGitControllerTest < ActionController::TestCase
     end
 
     def test_diff_truncated
+      assert_equal 0, @repository.changesets.count
       @repository.fetch_changesets
-      @repository.reload
+      @project.reload
+      assert_equal NUM_REV, @repository.changesets.count
       Setting.diff_max_lines_displayed = 5
 
       # Truncated diff of changeset 2f9c0091