1 files changed, 61 insertions, 0 deletions

diff --git a/test/controllers/assets_controller_test.rb b/test/controllers/assets_controller_test.rb
index f834541..4be2e8a 100644
--- a/test/controllers/assets_controller_test.rb
+++ b/test/controllers/assets_controller_test.rb
@@ -92,6 +92,57 @@ class AssetsControllerTest < ActionController::TestCase
     end
   end
 
+  # --- create with attach ---
+
+  test "create with node_id attaches the asset to the node's draft" do
+    node = Node.root.children.create!(:slug => "asset_attach_target")
+
+    post :create, params: { asset: { name: 'Attach me' }, node_id: node.id }
+
+    assert_response :redirect
+    asset = Asset.last
+    assert_includes node.draft.assets.reload, asset
+    assert_match /attached/, flash[:notice]
+  end
+
+  test "create against a foreign-locked node keeps the asset but refuses the attach" do
+    node = Node.root.children.create!(:slug => "asset_attach_locked")
+    node.lock_for_editing!(users(:aaron))
+
+    assert_difference 'Asset.count', 1 do
+      post :create, params: { asset: { name: 'Orphaned for now' }, node_id: node.id }
+    end
+
+    assert_empty node.draft.assets.reload
+    assert_equal node_path(node), flash[:locked_node_path]
+    assert_equal "aaron", flash[:locked_by]
+  end
+
+  test "create with headline against a page that has one keeps the incumbent and warns" do
+    node = Node.root.children.create!(:slug => "asset_attach_headline")
+    incumbent = Asset.create!(:name => 'Incumbent', :upload_content_type => 'image/png')
+    node.draft.related_assets.create!(:asset => incumbent, :headline => true)
+
+    uploaded = Rack::Test::UploadedFile.new(
+      Rails.root.join('test', 'fixtures', 'files', 'test_image.png'), 'image/png')
+    post :create, params: { asset: { name: 'Challenger', upload: uploaded },
+                            node_id: node.id, headline: "1" }
+
+    assert_includes node.draft.assets.reload, Asset.last
+    assert_equal incumbent, node.draft.reload.headline_asset
+    assert_equal node_path(node), flash[:headline_kept_path]
+  end
+
+  test "create with node_id writes an asset_create and an asset_attach entry" do
+    node = Node.root.children.create!(:slug => "asset_log_pair")
+    assert_difference 'NodeAction.where(:action => "asset_create").count' do
+      assert_difference 'NodeAction.where(:action => "asset_attach").count' do
+        post :create, params: { asset: { name: 'Logged twice' }, node_id: node.id }
+      end
+    end
+    assert_equal users(:quentin), NodeAction.last.user
+  end
+
   # --- edit ---
 
   test "get edit" do
@@ -141,6 +192,16 @@ class AssetsControllerTest < ActionController::TestCase
     assert !Dir.exist?(upload_dir), "Upload directory should be removed after destroy"
   end
 
+  test "destroy is witnessed in the action log with the current user" do
+    asset = Asset.create!(:name => 'Witness me',
+                           :upload_file_name => 'w.png',
+                           :upload_content_type => 'image/png')
+    assert_difference 'NodeAction.where(:action => "asset_destroy").count' do
+      delete :destroy, params: { id: asset.id }
+    end
+    assert_equal users(:quentin), NodeAction.last.user
+  end
+
   # --- URL helpers ---
 
   test "upload url returns correct path for original" do