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

Rails3: scm: git: fix error of test_db_consistent_ordering_before_1_2 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@7072 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-09-07 04:03:41 +00:00
parent 2510de53ae
commit 56ef96081b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/unit/repository_git_test.rb
View File

@ -183,16 +183,17 @@ class RepositoryGitTest < ActiveSupport::TestCase
def test_db_consistent_ordering_before_1_2 def test_db_consistent_ordering_before_1_2
assert_nil @repository.extra_info assert_nil @repository.extra_info
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_not_nil @repository.extra_info assert_not_nil @repository.extra_info
@repository.write_attribute(:extra_info, nil) @repository.write_attribute(:extra_info, nil)
@repository.save @repository.save
assert_nil @repository.extra_info assert_nil @repository.extra_info
assert_equal 21, @repository.changesets.count assert_equal NUM_REV, @repository.changesets.count
@repository.fetch_changesets @repository.fetch_changesets
@repository.reload @project.reload
assert_equal 0, @repository.extra_info["db_consistent"]["ordering"] assert_equal 0, @repository.extra_info["db_consistent"]["ordering"]
del_revs = [ del_revs = [
@ -215,13 +216,13 @@ class RepositoryGitTest < ActiveSupport::TestCase
"4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8" "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8"
@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 "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8", assert_equal "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8",
extra_info_db_1["master"]["last_scmid"] extra_info_db_1["master"]["last_scmid"]
@repository.fetch_changesets @repository.fetch_changesets
assert_equal 21, @repository.changesets.count assert_equal NUM_REV, @repository.changesets.count
assert_equal 0, @repository.extra_info["db_consistent"]["ordering"] assert_equal 0, @repository.extra_info["db_consistent"]["ordering"]
end end