diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-02-26 14:09:21 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-02-26 14:09:21 +0000 |
| commit | 9c264a7e66cbc64251e48a89eb8a0c37e556e491 (patch) | |
| tree | 80d3832d7d21b1749f43dce5dda9d9731e1f547c /test/unit/repository_cvs_test.rb | |
| parent | ad2036aabaf45703bf74194e204ea76a9033a742 (diff) | |
| download | redmine-9c264a7e66cbc64251e48a89eb8a0c37e556e491.tar.gz redmine-9c264a7e66cbc64251e48a89eb8a0c37e556e491.zip | |
Rails3: scm: cvs: fix error of test_fetch_changesets_incremental at unit model 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@9016 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/unit/repository_cvs_test.rb')
| -rw-r--r-- | test/unit/repository_cvs_test.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/test/unit/repository_cvs_test.rb b/test/unit/repository_cvs_test.rb index a616a2c09..21cb09160 100644 --- a/test/unit/repository_cvs_test.rb +++ b/test/unit/repository_cvs_test.rb @@ -112,11 +112,14 @@ class RepositoryCvsTest < ActiveSupport::TestCase def test_fetch_changesets_incremental assert_equal 0, @repository.changesets.count @repository.fetch_changesets + @project.reload + assert_equal CHANGESETS_NUM, @repository.changesets.count + # Remove changesets with revision > 3 @repository.changesets.find(:all).each {|c| c.destroy if c.revision.to_i > 3} - @repository.reload + @project.reload assert_equal 3, @repository.changesets.count - assert_equal %w|3 2 1|, @repository.changesets.collect(&:revision) + assert_equal %w|3 2 1|, @repository.changesets.all.collect(&:revision) rev3_commit = @repository.changesets.find(:first, :order => 'committed_on DESC') assert_equal '3', rev3_commit.revision @@ -128,10 +131,9 @@ class RepositoryCvsTest < ActiveSupport::TestCase assert_equal rev3_committed_on, latest_rev.committed_on @repository.fetch_changesets - @repository.reload + @project.reload assert_equal CHANGESETS_NUM, @repository.changesets.count - - assert_equal %w|7 6 5 4 3 2 1|, @repository.changesets.collect(&:revision) + assert_equal %w|7 6 5 4 3 2 1|, @repository.changesets.all.collect(&:revision) rev5_commit = @repository.changesets.find_by_revision('5') assert_equal 'HEAD-20071213-163001', rev5_commit.scmid # 2007-12-14 01:30:01 +0900 |