From 76738e5e54312bcf32b3c182090de251a77d8b8c Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Mon, 12 Sep 2011 14:02:59 +0000 Subject: [PATCH] Rails3: scm: mercurial: 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@7206 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/functional/repositories_mercurial_controller_test.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb index 2a63ac4d6..881b595e9 100644 --- a/test/functional/repositories_mercurial_controller_test.rb +++ b/test/functional/repositories_mercurial_controller_test.rb @@ -456,9 +456,10 @@ class RepositoriesMercurialControllerTest < 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 @@ -472,7 +473,7 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase ) assert @repository @repository.fetch_changesets - @repository.reload + @project.reload assert_equal 0, @repository.changesets.count get :destroy, :id => PRJ_ID -- 2.39.5