diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-09-12 14:13:47 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-09-12 14:13:47 +0000 |
| commit | cb108f9c75e76a88812951db3804a6839a1c722e (patch) | |
| tree | bf5167c8d6def38646f7dcfb1d99caae132eed43 /test | |
| parent | d11bd80041bff9680d2855847a31ea1da2cfe2ec (diff) | |
| download | redmine-cb108f9c75e76a88812951db3804a6839a1c722e.tar.gz redmine-cb108f9c75e76a88812951db3804a6839a1c722e.zip | |
Rails3: scm: mercurial: fix error of test_annotate_not_in_tip 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@7213 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test')
| -rw-r--r-- | test/functional/repositories_mercurial_controller_test.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb index 516001fd2..fca747356 100644 --- a/test/functional/repositories_mercurial_controller_test.rb +++ b/test/functional/repositories_mercurial_controller_test.rb @@ -374,9 +374,10 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase end def test_annotate_not_in_tip + assert_equal 0, @repository.changesets.count @repository.fetch_changesets - @repository.reload - assert @repository.changesets.size > 0 + @project.reload + assert_equal NUM_REV, @repository.changesets.count get :annotate, :id => PRJ_ID, :path => ['sources', 'welcome_controller.rb'] |