From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sun, 11 Sep 2011 11:54:34 +0000 (+0000)
Subject: Rails3: scm: git: fix error of test_next_nil at unit model test
X-Git-Tag: 1.3.0~871
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1e3ae6d3ba896f6a1841d44296da062c62aaf65b;p=redmine.git

Rails3: scm: git: fix error of test_next_nil at unit model 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@7097 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/test/unit/repository_git_test.rb b/test/unit/repository_git_test.rb
index 9bd43af5d..78637cd77 100644
--- a/test/unit/repository_git_test.rb
+++ b/test/unit/repository_git_test.rb
@@ -465,8 +465,10 @@ class RepositoryGitTest < ActiveSupport::TestCase
     end
 
     def test_next_nil
+      assert_equal 0, @repository.changesets.count
       @repository.fetch_changesets
-      @repository.reload
+      @project.reload
+      assert_equal NUM_REV, @repository.changesets.count
       %w|67e7792ce20ccae2e4bb73eed09bb397819c8834 67e7792ce20cca|.each do |r1|
         changeset = @repository.find_changeset_by_name(r1)
         assert_nil changeset.next