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:54 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-09-12 02:56:54 +0000
commit14386007f51e0e8be5ff82ef62c2ea3f43500a0c (patch)
tree13f9212ae0614df0d56bb065c845923e61053207 /test/functional/repositories_git_controller_test.rb
parenta3184147127d4722c9e2b6320c7eccd16e829fe8 (diff)
downloadredmine-14386007f51e0e8be5ff82ef62c2ea3f43500a0c.tar.gz
redmine-14386007f51e0e8be5ff82ef62c2ea3f43500a0c.zip
Rails3: scm: git: fix error of test_diff_truncated 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@7140 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 283873330..702b04abc 100644
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -237,8 +237,10 @@ class RepositoriesGitControllerTest < ActionController::TestCase
end
def test_diff_truncated
+ assert_equal 0, @repository.changesets.count
@repository.fetch_changesets
- @repository.reload
+ @project.reload
+ assert_equal NUM_REV, @repository.changesets.count
Setting.diff_max_lines_displayed = 5
# Truncated diff of changeset 2f9c0091