0
@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../test_helper'
0
 
0
 class AssetTest < Test::Unit::TestCase
0
   fixtures :sites, :assets, :tags, :taggings
0
-  
0
+
0
   def test_should_upload_and_create_asset_records
0
     asset_count = Object.const_defined?(:Magick) ? 3 : 1 # asset + 2 thumbnails
0
     
0
@@ -17,13 +17,14 @@ class AssetTest < Test::Unit::TestCase
0
       end
0
     end
0
   end
0
-  
0
+
0
   def test_should_upload_file
0
     process_upload
0
     assert_assets_exist :logo
0
   end  
0
 
0
   def test_should_rename_non_unique_filename
0
+    Site.multi_sites_enabled = false
0
     asset = process_upload
0
     assert_equal 'logo.png', asset.filename
0
     asset = process_upload
0
@@ -32,12 +33,13 @@ class AssetTest < Test::Unit::TestCase
0
   end
0
 
0
   def test_should_rename_non_unique_filename_when_renaming
0
+    Site.multi_sites_enabled = false
0
     now   = Time.now.utc
0
     asset = process_upload
0
     assert_equal 'logo.png', asset.filename
0
     asset = process_upload(:filename => 'logo_reloaded.png')
0
     assert_assets_exist :logo_reloaded, now
0
-    
0
+
0
     asset.update_attributes :filename => 'logo.png'
0
     assert_file_exists File.join(ASSET_PATH, now.year.to_s, now.month.to_s, now.day.to_s, "logo_1.png")
0
   end
0
@@ -168,7 +170,7 @@ class AssetTest < Test::Unit::TestCase
0
   protected
0
     def process_upload(options = {})
0
       a = sites(:first).assets.create(options.reverse_merge(:filename => 'logo.png', :content_type => 'image/png', 
0
-        :attachment_data => IO.read(File.join(RAILS_ROOT, 'public/images/mephisto/logo.png'))))
0
+        :attachment_data => IO.read(File.join(RAILS_ROOT, 'public','images','mephisto','logo.png'))))
0
       assert_valid a
0
       a
0
     end