From 780470aa0e1888e9501b5c491cf552b181a50324 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Mon, 12 Sep 2011 14:14:09 +0000 Subject: [PATCH] Rails3: scm: mercurial: fix error of test_annotate_at_given_revision 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@7214 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/functional/repositories_mercurial_controller_test.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb index fca747356..fe32d8c7d 100644 --- a/test/functional/repositories_mercurial_controller_test.rb +++ b/test/functional/repositories_mercurial_controller_test.rb @@ -386,8 +386,10 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase end def test_annotate_at_given_revision + assert_equal 0, @repository.changesets.count @repository.fetch_changesets - @repository.reload + @project.reload + assert_equal NUM_REV, @repository.changesets.count [2, '400bb8672109', '400', 400].each do |r1| get :annotate, :id => PRJ_ID, :rev => r1, :path => ['sources', 'watchers_controller.rb']