From 117ebf2d65d14d32310e8dcb079f983252cf7169 2011-09-12 02:58:06
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: 2011-09-12 02:58:06
Subject: [PATCH] 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

---

diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb
index 8dbd885..ac5efdf 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