From d1b878f6d02f8b51cbdf9c91e9b0f2d45f3a06bd Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Mon, 12 Sep 2011 01:16:40 +0000
Subject: [PATCH] Rails3: scm: mercurial: fix error of
 test_show_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@7129 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 17fdcd7eb..3437311ae 100644
--- a/test/functional/repositories_mercurial_controller_test.rb
+++ b/test/functional/repositories_mercurial_controller_test.rb
@@ -100,8 +100,10 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase
     end
 
     def test_show_at_given_revision
+      assert_equal 0, @repository.changesets.count
       @repository.fetch_changesets
-      @repository.reload
+      @project.reload
+      assert_equal NUM_REV, @repository.changesets.count
       [0, '0', '0885933ad4f6'].each do |r1|
         get :show, :id => PRJ_ID, :path => ['images'], :rev => r1
         assert_response :success