From 1e832322bec54bd92e0dcfb81ef1022492c93709 Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Mon, 12 Sep 2011 14:12:07 +0000
Subject: [PATCH] Rails3: scm: mercurial: fix error of test_show_branch 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@7209 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 6675ba4a0..1ba63b818 100644
--- a/test/functional/repositories_mercurial_controller_test.rb
+++ b/test/functional/repositories_mercurial_controller_test.rb
@@ -158,8 +158,10 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase
     end
 
     def test_show_branch
+      assert_equal 0, @repository.changesets.count
       @repository.fetch_changesets
-      @repository.reload
+      @project.reload
+      assert_equal NUM_REV, @repository.changesets.count
        [
           'default',
           @branch_char_1,