From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sun, 11 Sep 2011 08:42:30 +0000 (+0000)
Subject: Rails3: scm: git: fix error of test_db_consistent_ordering_before_1_2 at unit model... 
X-Git-Tag: 1.3.0~884
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=942563a1166997ec9cef751c14e6da154b648a19;p=redmine.git

Rails3: scm: git: fix error of test_db_consistent_ordering_before_1_2 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@7084 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/test/unit/repository_git_test.rb b/test/unit/repository_git_test.rb
index e8e1ac03d..392ab1af9 100644
--- a/test/unit/repository_git_test.rb
+++ b/test/unit/repository_git_test.rb
@@ -207,7 +207,7 @@ class RepositoryGitTest < ActiveSupport::TestCase
       @repository.changesets.each do |rev|
         rev.destroy if del_revs.detect {|r| r == rev.scmid.to_s }
       end
-      @repository.reload
+      @project.reload
       cs1 = @repository.changesets
       assert_equal 15, cs1.count
       assert_equal 0, @repository.extra_info["db_consistent"]["ordering"]