Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

This commit is contained in:
Jacques Distler 2009-12-27 00:43:28 -06:00
commit 27eab3ee41
2 changed files with 4 additions and 1 deletions

View file

@ -140,6 +140,7 @@ class AdminControllerTest < ActionController::TestCase
assert @web.allow_uploads?
assert_equal 300, @web.max_upload_size
assert File.directory? Rails.root.join("webs", "renamed_wiki1", "files")
assert !File.exist?(Rails.root.join("webs", "renamed_wiki1", "wiki1"))
assert !File.exist?(Rails.root.join("webs", "wiki1"))
end
@ -157,6 +158,7 @@ class AdminControllerTest < ActionController::TestCase
assert_response :success
assert @response.has_template_object?('error')
assert File.directory? Rails.root.join("webs", "wiki1", "files")
assert !File.exist?(Rails.root.join("webs", "renamed_wiki1", "wiki1"))
assert !File.exist?(Rails.root.join("webs", "renamed_wiki1"))
end
@ -179,6 +181,7 @@ class AdminControllerTest < ActionController::TestCase
assert !@web.count_pages?
assert !@web.allow_uploads?
assert File.directory? Rails.root.join("webs", "renamed_wiki1", "files")
assert !File.exist?(Rails.root.join("webs", "renamed_wiki1", "wiki1"))
assert !File.exist?(Rails.root.join("webs", "wiki1"))
end