5 files changed, 109 insertions, 1 deletions

diff --git a/test/controllers/assets_controller_test.rb b/test/controllers/assets_controller_test.rb
index f834541..05fc6de 100644
--- a/test/controllers/assets_controller_test.rb
+++ b/test/controllers/assets_controller_test.rb
@@ -92,6 +92,47 @@ 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
+
   # --- edit ---
 
   test "get edit" do
diff --git a/test/controllers/node_actions_controller_test.rb b/test/controllers/node_actions_controller_test.rb
index 8bc68ec..cfc5a31 100644
--- a/test/controllers/node_actions_controller_test.rb
+++ b/test/controllers/node_actions_controller_test.rb
@@ -48,4 +48,14 @@ class NodeActionsControllerTest < ActionController::TestCase
     get :index
     assert_response :redirect
   end
+
+  test "zooming on a node finds subtree entries recorded at its ancestor" do
+    parent = Node.root.children.create!(:slug => "zoom_participant_parent")
+    child  = parent.children.create!(:slug => "zoom_participant_child")
+    parent.trash!(users(:quentin))
+
+    get :index, params: { :node_id => child.id }
+    assert_response :success
+    assert_includes assigns(:actions).map(&:action), "trash"
+  end
 end
diff --git a/test/controllers/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb
index 55da524..d777108 100644
--- a/test/controllers/nodes_controller_test.rb
+++ b/test/controllers/nodes_controller_test.rb
@@ -79,6 +79,35 @@ class NodesControllerTest < ActionController::TestCase
     end
   end
 
+  test "create with asset_id attaches the asset to the new draft, as headline when asked" do
+    login_as :quentin
+    asset = Asset.create!(:name => 'Birth attachment', :upload_content_type => 'image/png')
+
+    post :create, params: { :kind => "generic", :parent_id => Node.root.id,
+                            :title => "Born Attached",
+                            :asset_id => asset.id, :asset_headline => "1" }
+
+    assert_response :redirect
+    node = Node.last
+    assert_includes node.draft.assets, asset
+    assert_equal asset, node.draft.headline_asset
+    assert_match /attached/, flash[:notice]
+  end
+
+  test "the attach notice survives the redirect into the editor" do
+    login_as :quentin
+    asset = Asset.create!(:name => 'Flash survivor', :upload_content_type => 'image/png')
+
+    post :create, params: { :kind => "generic", :parent_id => Node.root.id,
+                            :title => "Notice Carrier", :asset_id => asset.id }
+    assert_redirected_to edit_node_path(Node.last)
+
+    get :edit, params: { :id => Node.last.id }
+    assert_response :success
+    assert_match /attached/, flash[:notice]
+    assert_no_match /ready to edit/, flash[:notice]
+  end
+
   test "editing a node" do
     login_as :quentin
 
diff --git a/test/models/node_action_test.rb b/test/models/node_action_test.rb
index b177cca..849b36f 100644
--- a/test/models/node_action_test.rb
+++ b/test/models/node_action_test.rb
@@ -118,11 +118,29 @@ class NodeActionTest < ActiveSupport::TestCase
 
   test "record! passes provenance and historical timestamps through" do
     long_ago = 2.years.ago
-    action = NodeAction.record!(:node => nil, :action => "publish",
+    node = Node.root.children.create!(:slug => "provenance_backfill_test")
+    action = NodeAction.record!(:node => node, :action => "publish",
                                  :occurred_at => long_ago,
                                  :inferred_from => "from_page_revision")
 
     assert_equal "from_page_revision", action.inferred_from
     assert_in_delta long_ago.to_f, action.occurred_at.to_f, 1.0
   end
+
+
+  test "record! with participants: writes one action_participant per subject" do
+    n1, n2 = Node.root.children.create!(:slug => "participant_a"), Node.root.children.create!(:slug => "participant_b")
+    action = NodeAction.record!(:participants => [n1, n2], :action => "trash", :user => users(:quentin))
+    assert_equal [n1, n2], action.action_participants.map(&:subject)
+  end
+
+  test "record! with node: alone still writes exactly one participant" do
+    node = Node.root.children.create!(:slug => "participant_sugar")
+    action = NodeAction.record!(:node => node, :action => "create", :user => users(:quentin))
+    assert_equal [node], action.action_participants.map(&:subject)
+  end
+
+  test "record! refuses an empty participant set" do
+    assert_raises(ArgumentError) { NodeAction.record!(:action => "create", :user => users(:quentin)) }
+  end
 end
diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index ba38340..0083b08 100644
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -756,6 +756,16 @@ class NodeTest < ActiveSupport::TestCase
     assert node.valid?
   end
 
+  test "trash! records every subtree node as a participant, not just the root" do
+    parent = Node.root.children.create!(:slug => "trash_participants_parent")
+    child  = parent.children.create!(:slug => "trash_participants_child")
+
+    parent.trash!(users(:quentin))
+
+    action = parent.node_actions.where(:action => "trash").last
+    assert_includes action.action_participants.map(&:subject), child
+  end
+
   test "destroying a node with children is refused" do
     parent = Node.root.children.create!(:slug => "destroy_guard_parent")
     parent.children.create!(:slug => "destroy_guard_child")