From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Mon, 12 Sep 2011 02:45:20 +0000 (+0000)
Subject: Rails3: scm: cvs: fix error of test_annotate at unit model test
X-Git-Tag: 1.3.0~831
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a2d999592f73017c7316eaecc0c0677c5d298181;p=redmine.git

Rails3: scm: cvs: fix error of test_annotate 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@7137 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/test/unit/repository_cvs_test.rb b/test/unit/repository_cvs_test.rb
index ea146d691..f9a6a5a54 100644
--- a/test/unit/repository_cvs_test.rb
+++ b/test/unit/repository_cvs_test.rb
@@ -149,8 +149,10 @@ class RepositoryCvsTest < ActiveSupport::TestCase
     end
 
     def test_annotate
+      assert_equal 0, @repository.changesets.count
       @repository.fetch_changesets
-      @repository.reload
+      @project.reload
+      assert_equal CHANGESETS_NUM, @repository.changesets.count
       ann = @repository.annotate('README')
       assert ann
       assert_equal 3, ann.revisions.length