summaryrefslogtreecommitdiffstats
path: root/test/functional/repositories_git_controller_test.rb
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-09-12 02:57:34 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-09-12 02:57:34 +0000
commita6193f90e3628a0dfb7f42f5cbc11ea86ea37cb3 (patch)
tree0d3303e50ac80849ff180040f1bfcf9929fedc63 /test/functional/repositories_git_controller_test.rb
parent14386007f51e0e8be5ff82ef62c2ea3f43500a0c (diff)
downloadredmine-a6193f90e3628a0dfb7f42f5cbc11ea86ea37cb3.tar.gz
redmine-a6193f90e3628a0dfb7f42f5cbc11ea86ea37cb3.zip
Rails3: scm: git: 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@7141 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional/repositories_git_controller_test.rb')
-rw-r--r--test/functional/repositories_git_controller_test.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb
index 702b04abc..8dbd885fe 100644
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -260,8 +260,10 @@ class RepositoriesGitControllerTest < 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
['inline', 'sbs'].each do |dt|
get :diff,
:id => PRJ_ID,