summaryrefslogtreecommitdiffstats
path: root/test/functional/repositories_darcs_controller_test.rb
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-09-12 04:12:29 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-09-12 04:12:29 +0000
commite8e2fde49012377aadc7019e91fbc6b8f8779a5c (patch)
tree5a1af216d685b7ffd02ef3abf7d4432e0dbc2d2b /test/functional/repositories_darcs_controller_test.rb
parentf60183eae72b3867be91f9f26c9adeecea9ac1ed (diff)
downloadredmine-e8e2fde49012377aadc7019e91fbc6b8f8779a5c.tar.gz
redmine-e8e2fde49012377aadc7019e91fbc6b8f8779a5c.zip
Rails3: scm: darcs: fix error of test_destroy_invalid_repository 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@7161 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional/repositories_darcs_controller_test.rb')
-rw-r--r--test/functional/repositories_darcs_controller_test.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/functional/repositories_darcs_controller_test.rb b/test/functional/repositories_darcs_controller_test.rb
index fd1e46ce8..4bc399b19 100644
--- a/test/functional/repositories_darcs_controller_test.rb
+++ b/test/functional/repositories_darcs_controller_test.rb
@@ -132,9 +132,10 @@ class RepositoriesDarcsControllerTest < ActionController::TestCase
def test_destroy_invalid_repository
@request.session[:user_id] = 1 # admin
+ assert_equal 0, @repository.changesets.count
@repository.fetch_changesets
- @repository.reload
- assert @repository.changesets.count > 0
+ @project.reload
+ assert_equal NUM_REV, @repository.changesets.count
get :destroy, :id => PRJ_ID
assert_response 302
@@ -148,7 +149,7 @@ class RepositoriesDarcsControllerTest < ActionController::TestCase
)
assert @repository
@repository.fetch_changesets
- @repository.reload
+ @project.reload
assert_equal 0, @repository.changesets.count
get :destroy, :id => PRJ_ID