summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-09-12 14:12:57 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-09-12 14:12:57 +0000
commit321fac2668901c224fb16a949159664c454655be (patch)
tree770eb0f061427dec269adf17e8f4ef42ff4fd189
parent1a32f541fce9c27771c0920a09d9c78c805399c7 (diff)
downloadredmine-321fac2668901c224fb16a949159664c454655be.tar.gz
redmine-321fac2668901c224fb16a949159664c454655be.zip
Rails3: scm: mercurial: fix error of test_diff 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@7211 e93f8b46-1217-0410-a6f0-8f06a7374b81
-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 d814de367..a7b733690 100644
--- a/test/functional/repositories_mercurial_controller_test.rb
+++ b/test/functional/repositories_mercurial_controller_test.rb
@@ -271,8 +271,10 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase
end
def test_diff
+ assert_equal 0, @repository.changesets.count
@repository.fetch_changesets
- @repository.reload
+ @project.reload
+ assert_equal NUM_REV, @repository.changesets.count
[4, '4', 'def6d2f1254a'].each do |r1|
# Full diff of changeset 4
['inline', 'sbs'].each do |dt|