From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Mon, 12 Sep 2011 14:11:14 +0000 (+0000)
Subject: Rails3: scm: mercurial: fix error of test_show_directory_sql_escape_percent at functi... 
X-Git-Tag: 1.3.0~761
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3d90ba833b76acbad5d854f5eb6ed77297a76c20;p=redmine.git

Rails3: scm: mercurial: fix error of test_show_directory_sql_escape_percent 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@7207 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb
index 881b595e9..3ae3bf132 100644
--- a/test/functional/repositories_mercurial_controller_test.rb
+++ b/test/functional/repositories_mercurial_controller_test.rb
@@ -116,8 +116,10 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase
     end
 
     def test_show_directory_sql_escape_percent
+      assert_equal 0, @repository.changesets.count
       @repository.fetch_changesets
-      @repository.reload
+      @project.reload
+      assert_equal NUM_REV, @repository.changesets.count
       [13, '13', '3a330eb32958'].each do |r1|
         get :show, :id => PRJ_ID, :path => ['sql_escape', 'percent%dir'],
             :rev => r1