summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-09-12 14:13:22 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-09-12 14:13:22 +0000
commitd11bd80041bff9680d2855847a31ea1da2cfe2ec (patch)
tree0081709eb6464b55360816fcf51b82c284432661 /test
parent321fac2668901c224fb16a949159664c454655be (diff)
downloadredmine-d11bd80041bff9680d2855847a31ea1da2cfe2ec.tar.gz
redmine-d11bd80041bff9680d2855847a31ea1da2cfe2ec.zip
Rails3: scm: mercurial: fix error of test_diff_two_revs 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@7212 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test')
-rw-r--r--test/functional/repositories_mercurial_controller_test.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb
index a7b733690..516001fd2 100644
--- a/test/functional/repositories_mercurial_controller_test.rb
+++ b/test/functional/repositories_mercurial_controller_test.rb
@@ -295,8 +295,10 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase
end
def test_diff_two_revs
+ 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|
[4, 'def6d2f1254a'].each do |r2|
['inline', 'sbs'].each do |dt|