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:58:06 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-09-12 02:58:06 +0000
commit117ebf2d65d14d32310e8dcb079f983252cf7169 (patch)
tree14809d37cee2781d143de236a324789e674bf8ff /test/functional/repositories_git_controller_test.rb
parenta6193f90e3628a0dfb7f42f5cbc11ea86ea37cb3 (diff)
downloadredmine-117ebf2d65d14d32310e8dcb079f983252cf7169.tar.gz
redmine-117ebf2d65d14d32310e8dcb079f983252cf7169.zip
Rails3: scm: git: fix error of test_annotate_at_given_revision 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@7142 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 8dbd885fe..ac5efdf1d 100644
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -336,8 +336,10 @@ class RepositoriesGitControllerTest < ActionController::TestCase
end
def test_annotate_at_given_revision
+ assert_equal 0, @repository.changesets.count
@repository.fetch_changesets
- @repository.reload
+ @project.reload
+ assert_equal NUM_REV, @repository.changesets.count
get :annotate, :id => PRJ_ID, :rev => 'deff7',
:path => ['sources', 'watchers_controller.rb']
assert_response :success