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:56:23 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-09-12 02:56:23 +0000
commita3184147127d4722c9e2b6320c7eccd16e829fe8 (patch)
tree8c53233d318d20857d7309e47f415651f4741b60 /test/functional/repositories_git_controller_test.rb
parent1cae0ae4157d1c581ee1977f5fde48515c1648a9 (diff)
downloadredmine-a3184147127d4722c9e2b6320c7eccd16e829fe8.tar.gz
redmine-a3184147127d4722c9e2b6320c7eccd16e829fe8.zip
Rails3: scm: git: 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@7139 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 31f48123b..283873330 100644
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -214,8 +214,10 @@ class RepositoriesGitControllerTest < 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
# Full diff of changeset 2f9c0091
['inline', 'sbs'].each do |dt|
get :diff,