kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rails3: scm: git: fix error of test_fetch_changesets_invalid_rev 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@7070 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-09-07 04:01:49 +00:00
parent 83133302f4
commit 63d55cea85
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/unit/repository_git_test.rb
View File

@ -133,10 +133,10 @@ class RepositoryGitTest < ActiveSupport::TestCase
end end
def test_fetch_changesets_invalid_rev def test_fetch_changesets_invalid_rev
assert_equal 0, @repository.changesets.count
@repository.fetch_changesets @repository.fetch_changesets
@repository.reload @project.reload
assert_equal 21, @repository.changesets.count assert_equal NUM_REV, @repository.changesets.count
assert_equal 33, @repository.changes.count
extra_info_db = @repository.extra_info["branches"] extra_info_db = @repository.extra_info["branches"]
assert_equal 4, extra_info_db.size assert_equal 4, extra_info_db.size
assert_equal "1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127", assert_equal "1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127",
@ -155,7 +155,7 @@ class RepositoryGitTest < ActiveSupport::TestCase
@repository.changesets.each do |rev| @repository.changesets.each do |rev|
rev.destroy if del_revs.detect {|r| r == rev.scmid.to_s } rev.destroy if del_revs.detect {|r| r == rev.scmid.to_s }
end end
@repository.reload @project.reload
cs1 = @repository.changesets cs1 = @repository.changesets
assert_equal 15, cs1.count assert_equal 15, cs1.count
h = @repository.extra_info.dup h = @repository.extra_info.dup
@ -163,12 +163,13 @@ class RepositoryGitTest < ActiveSupport::TestCase
"abcd1234efgh" "abcd1234efgh"
@repository.merge_extra_info(h) @repository.merge_extra_info(h)
@repository.save @repository.save
@repository.reload @project.reload
extra_info_db_1 = @repository.extra_info["branches"] extra_info_db_1 = @repository.extra_info["branches"]
assert_equal "abcd1234efgh", assert_equal "abcd1234efgh",
extra_info_db_1["master"]["last_scmid"] extra_info_db_1["master"]["last_scmid"]
@repository.fetch_changesets @repository.fetch_changesets
@project.reload
assert_equal 15, @repository.changesets.count assert_equal 15, @repository.changesets.count
end end