From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Mon, 12 Sep 2011 00:12:44 +0000 (+0000)
Subject: Rails3: scm: mercurial: fix error of test_copied_files at unit model test
X-Git-Tag: 1.3.0~851
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4366112cfac1a5b0fbe43d54e46ff14f3f73534d;p=redmine.git

Rails3: scm: mercurial: fix error of test_copied_files 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@7117 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/test/unit/repository_mercurial_test.rb b/test/unit/repository_mercurial_test.rb
index d2ab56bda..087fb49d7 100644
--- a/test/unit/repository_mercurial_test.rb
+++ b/test/unit/repository_mercurial_test.rb
@@ -175,8 +175,10 @@ class RepositoryMercurialTest < ActiveSupport::TestCase
     end
 
     def test_copied_files
+      assert_equal 0, @repository.changesets.count
       @repository.fetch_changesets
-      @repository.reload
+      @project.reload
+      assert_equal NUM_REV, @repository.changesets.count
 
       cs1 = @repository.changesets.find_by_revision('13')
       assert_not_nil cs1