deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix a broken test

Browse source
This commit is contained in:
Jacques Distler 2009-12-27 00:41:04 -06:00
parent 601331b508
commit b75aa4b8d6
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/wiki.rb
View file

@ -41,7 +41,7 @@ class Wiki
def move_files(old_path, new_path)
return if new_path == old_path
default_path = Rails.root.join("webs", "files")
FileUtils.rmdir(new_path)
FileUtils.rmdir(new_path) if File.exist?(new_path)
if [old_path, new_path].include? default_path
File.rename(old_path, new_path)
FileUtils.rmdir(old_path.parent) unless old_path == default_path

3
test/functional/admin_controller_test.rb
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