From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Mon, 12 Sep 2011 10:53:20 +0000 (+0000)
Subject: Rails3: scm: cvs: fix error of test_destroy_invalid_repository at functional test
X-Git-Tag: 1.3.0~797
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5fe6f57cb60e79eb2cd2bc8513591e68aff7241c;p=redmine.git

Rails3: scm: cvs: fix error of test_destroy_invalid_repository at functional 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@7171 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/test/functional/repositories_cvs_controller_test.rb b/test/functional/repositories_cvs_controller_test.rb
index 88e5326e5..97c34f648 100644
--- a/test/functional/repositories_cvs_controller_test.rb
+++ b/test/functional/repositories_cvs_controller_test.rb
@@ -229,9 +229,10 @@ class RepositoriesCvsControllerTest < ActionController::TestCase
 
     def test_destroy_invalid_repository
       @request.session[:user_id] = 1 # admin
+      assert_equal 0, @repository.changesets.count
       @repository.fetch_changesets
-      @repository.reload
-      assert @repository.changesets.count > 0
+      @project.reload
+      assert_equal NUM_REV, @repository.changesets.count
 
       get :destroy, :id => PRJ_ID
       assert_response 302
@@ -246,7 +247,7 @@ class RepositoriesCvsControllerTest < ActionController::TestCase
                               )
       assert @repository
       @repository.fetch_changesets
-      @repository.reload
+      @project.reload
       assert_equal 0, @repository.changesets.count
 
       get :destroy, :id => PRJ_ID