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

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

diff --git a/test/unit/repository_cvs_test.rb b/test/unit/repository_cvs_test.rb
index bf7cfc24a..1c60c5944 100644
--- a/test/unit/repository_cvs_test.rb
+++ b/test/unit/repository_cvs_test.rb
@@ -105,8 +105,10 @@ class RepositoryCvsTest < ActiveSupport::TestCase
     end
 
     def test_entries_invalid_path
+      assert_equal 0, @repository.changesets.count
       @repository.fetch_changesets
-      @repository.reload
+      @project.reload
+      assert_equal CHANGESETS_NUM, @repository.changesets.count
       assert_nil @repository.entries('missing')
       assert_nil @repository.entries('missing', '3')
     end