1 files changed, 13 insertions, 19 deletions

diff --git a/test/controllers/assets_controller_test.rb b/test/controllers/assets_controller_test.rb
index 5f5f6e5..f834541 100644
--- a/test/controllers/assets_controller_test.rb
+++ b/test/controllers/assets_controller_test.rb
@@ -4,17 +4,16 @@ class AssetsControllerTest < ActionController::TestCase
 
   def setup
     login_as :quentin
+    @existing_asset_ids = Asset.pluck(:id)
   end
 
   def teardown
-    # Clean up any files written to disk during tests
-    Dir.glob(Rails.root.join('public', 'system', 'uploads', 'test_*')).each do |dir|
+    (Asset.pluck(:id) - @existing_asset_ids).each do |id|
+      dir = Asset.upload_root.join(id.to_s)
+      raise "Refusing to delete #{dir} -- outside tmp/, Rails.env.test? may be false" unless
+        dir.to_s.start_with?(Rails.root.join("tmp").to_s)
       FileUtils.rm_rf(dir)
     end
-    # Remove uploads created for assets created during tests
-    Asset.where("upload_file_name IS NOT NULL").where("id > 1000000").each do |a|
-      FileUtils.rm_rf(Rails.root.join('public', 'system', 'uploads', a.id.to_s))
-    end
   end
 
   # --- index ---
@@ -64,15 +63,14 @@ class AssetsControllerTest < ActionController::TestCase
 
     # original and all four variants should exist on disk
     %w[original medium thumb headline large].each do |style|
-      path = Rails.root.join('public', 'system', 'uploads',
-                             asset.id.to_s, style, 'test_image.png')
+      path = asset.send(:file_path, style)
       assert File.exist?(path), "Expected #{style} variant at #{path}"
     end
   end
 
   # --- create with PDF ---
 
-  test "create asset with PDF upload generates only original" do
+  test "create asset with PDF upload generates rasterized variants" do
     uploaded = Rack::Test::UploadedFile.new(
       Rails.root.join('test', 'fixtures', 'files', 'test_document.pdf'),
       'application/pdf'
@@ -83,18 +81,14 @@ class AssetsControllerTest < ActionController::TestCase
     assert_response :redirect
 
     asset = Asset.last
-    assert_equal 'test_document.pdf', asset.upload_file_name
-    assert_equal 'application/pdf',   asset.upload_content_type
-
-    # only original should exist, no image variants
-    original_path = Rails.root.join('public', 'system', 'uploads',
-                                    asset.id.to_s, 'original', 'test_document.pdf')
+    original_path = asset.send(:file_path, :original)
     assert File.exist?(original_path), "Expected original at #{original_path}"
+    assert_equal 'test_document.pdf', File.basename(original_path)
 
     %w[medium thumb headline large].each do |style|
-      path = Rails.root.join('public', 'system', 'uploads',
-                             asset.id.to_s, style, 'test_document.pdf')
-      assert !File.exist?(path), "Expected no #{style} variant for PDF"
+      path = asset.send(:file_path, style)
+      assert File.exist?(path), "Expected a #{style} variant at #{path}"
+      assert_equal '.png', File.extname(path), "Expected #{style} variant to be a PNG, not a PDF"
     end
   end
 
@@ -137,7 +131,7 @@ class AssetsControllerTest < ActionController::TestCase
     )
     post :create, params: { asset: { name: 'To be deleted', upload: uploaded } }
     asset = Asset.last
-    upload_dir = Rails.root.join('public', 'system', 'uploads', asset.id.to_s)
+    upload_dir = asset.send(:upload_root).join(asset.id.to_s)
     assert Dir.exist?(upload_dir), "Upload directory should exist before destroy"
 
     assert_difference 'Asset.count', -1 do