[BREAKS BUILD] Some work on File uploads, half-done, committing as a backup

test/unit/file_yard_test.rb

@@ -1,70 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../test_helper'
-require 'fileutils'
-require 'file_yard'
-require 'stringio'
-
-class FileYardTest < Test::Unit::TestCase
-
-  def setup
-    FileUtils.mkdir_p(file_path)
-    FileUtils.rm(Dir["#{file_path}/*"])
-    @yard = FileYard.new(file_path, 100)
-  end
-
-  def test_check_upload_size
-    assert_nothing_raised { @yard.check_upload_size(100.kilobytes) }
-    assert_raises(Instiki::ValidationError) { @yard.check_upload_size(100.kilobytes + 1) }
-  end
-
-  def test_files
-    assert_equal [], @yard.files
-    
-    # FileYard gets the list of files from directory in the constructor
-    @yard.upload_file('aaa', StringIO.new('file contents'))
-    assert_equal ["#{file_path}/aaa"], Dir["#{file_path}/*"]
-    assert_equal ['aaa'], @yard.files
-    assert @yard.has_file?('aaa')
-    assert_equal 'file contents', File.read(@yard.file_path('aaa'))
-  end
-
-  def test_file_path
-    assert_equal "#{file_path}/abcd", @yard.file_path('abcd')
-  end
-
-  def test_size_limit
-    @yard = FileYard.new(file_path, 1)
-    one_kilobyte_string = "a" * 1.kilobyte
-
-    # as StringIO
-    assert_nothing_raised { 
-      @yard.upload_file('acceptable_file', StringIO.new(one_kilobyte_string)) 
-    }
-    assert_raises(Instiki::ValidationError) { 
-      @yard.upload_file('one_byte_too_long', StringIO.new(one_kilobyte_string + 'a')) 
-    }
-
-    # as Tempfile
-    require 'tempfile'
-
-    Tempfile.open('acceptable_file') do |f| 
-      f.write(one_kilobyte_string)
-      assert_nothing_raised { 
-        @yard.upload_file('acceptable_file', f) 
-      }
-    end
-
-    Tempfile.open('one_byte_too_long') do |f|
-      f.write(one_kilobyte_string + 'a')
-      assert_nothing_raised { 
-        @yard.upload_file('one_byte_too_long_2', f)
-      }
-    end
-  end
-
-  def file_path
-    "#{RAILS_ROOT}/storage/test/instiki"
-  end
-
-end

test/unit/page_renderer_test.rb

@@ -277,9 +277,10 @@ class PageRendererTest < Test::Unit::TestCase
   end
   
   def test_link_to_pic
-    FileUtils.mkdir_p "#{RAILS_ROOT}/storage/test/wiki1"
-    FileUtils.rm(Dir["#{RAILS_ROOT}/storage/test/wiki1/*"])
-    @wiki.file_yard(@web).upload_file('square.jpg', StringIO.new(''))
+    WikiFile.delete_all
+    require 'fileutils'
+    FileUtils.rm_rf("#{RAILS_ROOT}/public/wiki1/files/*")
+    @web.wiki_files.create(:file_name => 'square.jpg', :description => 'Square', :content => 'never mind')
     assert_markup_parsed_as(
       '<p><img alt="Square" src="../pic/square.jpg" /></p>',
       '[[square.jpg|Square:pic]]')
@@ -305,8 +306,6 @@ class PageRendererTest < Test::Unit::TestCase
   	  '[[With:Colon]]')
   end
   
-  # TODO Remove the leading underscores from this test when upgrading to RedCloth 3.0.1; 
-  # also add a test for the "Unhappy Face" problem (another interesting RedCloth bug)
   def test_list_with_tildas
     list_with_tildas = <<-EOL
       * "a":~b

test/unit/wiki_file_test.rb

@@ -0,0 +1,84 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'fileutils'
+
+class WikiFileTest < Test::Unit::TestCase
+  include FileUtils
+  fixtures :webs, :pages, :revisions, :system, :wiki_references
+
+  def setup
+    @web = webs(:test_wiki)
+    mkdir_p("#{RAILS_ROOT}/public/wiki1/files/")
+    rm_rf("#{RAILS_ROOT}/public/wiki1/files/*")
+    WikiFile.delete_all
+  end
+
+  def test_basic_store_and_retrieve_ascii_file
+    @web.wiki_files.create(:file_name => 'binary_file', :description => 'Binary file', :content => "\001\002\003")
+    binary = WikiFile.find_by_file_name('binary_file')
+    assert_equal "\001\002\003", binary.content
+  end
+
+  def test_basic_store_and_retrieve_binary_file
+    @web.wiki_files.create(:file_name => 'text_file', :description => 'Text file', :content => "abc")
+    text = WikiFile.find_by_file_name('text_file')
+    assert_equal "abc", text.content
+  end
+
+  def test_storing_an_image
+    rails_gif = File.open("#{RAILS_ROOT}/test/fixtures/rails.gif", 'rb') { |f| f.read }
+    assert_equal rails_gif.size, File.size("#{RAILS_ROOT}/test/fixtures/rails.gif")
+
+    @web.wiki_files.create(:file_name => 'rails.gif', :description => 'Rails logo', :content => rails_gif)
+
+    rails_gif_from_db = WikiFile.find_by_file_name('rails.gif')
+    assert_equal rails_gif.size, rails_gif_from_db.content.size
+    assert_equal rails_gif, rails_gif_from_db.content
+  end
+  
+  def test_mandatory_fields_validations
+    assert_validation(:file_name, '', :fail)
+    assert_validation(:file_name, nil, :fail)
+    assert_validation(:content, '', :fail)
+    assert_validation(:content, nil, :fail)
+  end
+  
+  def test_upload_size_validation
+    assert_validation(:content, 'a' * 100.kilobytes, :pass)
+    assert_validation(:content, 'a' * (100.kilobytes + 1), :fail)
+  end
+  
+  def test_file_name_size_validation
+    assert_validation(:file_name, '', :fail)
+    assert_validation(:file_name, 'a', :pass)
+    assert_validation(:file_name, 'a' * 50, :pass)
+    assert_validation(:file_name, 'a' * 51, :fail)
+  end
+  
+  def test_file_name_pattern_validation
+    assert_validation(:file_name, ".. Accep-table File.name", :pass)
+    assert_validation(:file_name, "/bad", :fail)
+    assert_validation(:file_name, "~bad", :fail)
+    assert_validation(:file_name, "..\bad", :fail)
+    assert_validation(:file_name, "\001bad", :fail)
+    assert_validation(:file_name, ".", :fail)
+    assert_validation(:file_name, "..", :fail)
+  end
+
+  def test_find_by_file_name
+    assert_equal @file1, WikiFile.find_by_file_name('file1.txt')
+    assert_nil WikiFile.find_by_file_name('unknown_file')
+  end
+
+  def assert_validation(field, value, expected_result)
+    values = {:file_name => '0', :description => '0', :content =>  '0'}
+    raise "WikiFile has no attribute named #{field.inspect}" unless values.has_key?(field)
+    values[field] = value
+
+    new_object = @web.wiki_files.create(values)
+    if expected_result == :pass then assert(new_object.valid?, new_object.errors.inspect)
+    elsif expected_result == :fail then assert(!new_object.valid?)
+    else raise "Unknown value of expected_result: #{expected_result.inspect}"
+    end
+  end
+
+end