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

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

diff --git a/test/unit/repository_git_test.rb b/test/unit/repository_git_test.rb
index 7648be5b0..70f8fe690 100644
--- a/test/unit/repository_git_test.rb
+++ b/test/unit/repository_git_test.rb
@@ -414,8 +414,10 @@ class RepositoryGitTest < ActiveSupport::TestCase
     end
 
     def test_log_utf8
+      assert_equal 0, @repository.changesets.count
       @repository.fetch_changesets
-      @repository.reload
+      @project.reload
+      assert_equal NUM_REV, @repository.changesets.count
       str_felix_hex  = FELIX_HEX.dup
       if str_felix_hex.respond_to?(:force_encoding)
           str_felix_hex.force_encoding('UTF-8')