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

This commit is contained in:
Jacques Distler 2010-10-05 10:10:13 -05:00
commit 5ca5bce628
7 changed files with 360 additions and 99 deletions

View file

@ -142,6 +142,7 @@ class WikiControllerTest < ActionController::TestCase
# Tempfile doesn't know how to open files with binary flag, hence the two-step process
Tempfile.open('instiki_export_file') { |f| @tempfile_path = f.path }
# some wacky bug in Ruby 1.9.2p0's Tempfile is fixed by
@tempfile_path.to_s
begin
File.open(@tempfile_path, 'wb') { |f| f.write(r.body); @exported_file = f.path }