4 files changed, 179 insertions, 32 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/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb
index ddc4565..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
 
@@ -409,7 +438,7 @@ class NodesControllerTest < ActionController::TestCase
 
     get :show, params: { id: node.id }
     assert_response :success
-    assert_select "a", text: "add event"
+    assert_select "a", text: "Add event"
     assert_select "a[href*='tag_list=open-day']"
     assert_select "a[href*='auto_tag_source=erfa-detail']"
   end
@@ -420,7 +449,7 @@ class NodesControllerTest < ActionController::TestCase
 
     get :show, params: { id: node.id }
     assert_response :success
-    assert_select "a", text: "add event"
+    assert_select "a", text: "Add event"
     assert_select "a[href*='tag_list=']", count: 0
   end
 
@@ -514,12 +543,6 @@ class NodesControllerTest < ActionController::TestCase
     assert_includes assigns(:nodes), chaostreff_node
   end
 
-  test "recent combined with a search term does not raise an ambiguous column error" do
-    login_as :quentin
-    get :recent, params: { :q => "Zombies" }
-    assert_response :success
-  end
-
   test "drafts combined with a search term does not raise an ambiguous column error" do
     login_as :quentin
     get :drafts, params: { :q => "Zombies" }
diff --git a/test/models/node_attach_asset_test.rb b/test/models/node_attach_asset_test.rb
new file mode 100644
index 0000000..cb5b60f
--- /dev/null
+++ b/test/models/node_attach_asset_test.rb
@@ -0,0 +1,107 @@
+require "test_helper"
+
+class NodeAttachAssetTest < ActiveSupport::TestCase
+
+  def setup
+    @user  = users(:quentin)
+    @other = users(:aaron)
+    @node  = Node.root.children.create!(:slug => "attach_asset_test")
+    @image = create_image_asset
+  end
+
+  test "attaches to a draft-only node" do
+    result = @node.attach_asset!(@image, :user => @user)
+    assert_equal 1, result[:attached]
+    assert_includes @node.draft.assets, @image
+  end
+
+  test "attaches to head when no draft is pending" do
+    @node.publish_draft!(@user)
+    result = @node.attach_asset!(@image, :user => @user)
+    assert_equal 1, result[:attached]
+    assert_includes @node.head.assets, @image
+  end
+
+  test "attaches to head and pending draft alike" do
+    @node.publish_draft!(@user)
+    @node.lock_for_editing!(@user)
+    @node.create_new_draft(@user)
+    result = @node.attach_asset!(@image, :user => @user)
+    assert_equal 2, result[:attached]
+    assert_includes @node.head.assets, @image
+    assert_includes @node.draft.assets, @image
+  end
+
+  test "attaches to all three lifecycle rows" do
+    @node.publish_draft!(@user)
+    @node.lock_for_editing!(@user)
+    @node.create_new_draft(@user)
+    @node.autosave!({ :title => "wip" }, @user)
+    result = @node.attach_asset!(@image, :user => @user)
+    assert_equal 3, result[:attached]
+    [@node.head, @node.draft, @node.autosave].each do |row|
+      assert_includes row.assets, @image
+    end
+  end
+
+  test "skips rows that already carry the asset" do
+    @node.draft.related_assets.create!(:asset => @image)
+    @node.publish_draft!(@user)
+    @node.lock_for_editing!(@user)
+    @node.create_new_draft(@user)
+    result = @node.attach_asset!(@image, :user => @user)
+    assert_equal 0, result[:attached]
+    assert_equal 2, result[:already]
+    assert_equal 1, @node.draft.related_assets.where(:asset_id => @image.id).count
+  end
+
+  test "refuses when another user holds the lock and writes nothing" do
+    @node.lock_for_editing!(@other)
+    assert_raises(LockedByAnotherUser) { @node.attach_asset!(@image, :user => @user) }
+    assert_empty @node.draft.assets.reload
+  end
+
+  test "proceeds when the attaching user holds the lock" do
+    @node.lock_for_editing!(@user)
+    result = @node.attach_asset!(@image, :user => @user)
+    assert_equal 1, result[:attached]
+  end
+
+  test "sets the headline when none exists" do
+    result = @node.attach_asset!(@image, :user => @user, :headline => true)
+    assert_equal :set, result[:headline]
+    assert_equal @image, @node.draft.headline_asset
+  end
+
+  test "keeps an existing headline and reports it" do
+    incumbent = create_image_asset
+    @node.draft.related_assets.create!(:asset => incumbent, :headline => true)
+    result = @node.attach_asset!(@image, :user => @user, :headline => true)
+    assert_equal :kept_existing, result[:headline]
+    assert_equal incumbent, @node.draft.reload.headline_asset
+    assert_includes @node.draft.assets, @image
+  end
+
+  test "declines the headline flag for ineligible asset types" do
+    plain = create_plain_asset
+    result = @node.attach_asset!(plain, :user => @user, :headline => true)
+    assert_equal :not_eligible, result[:headline]
+    assert_includes @node.draft.assets.reload, plain
+    assert_nil @node.draft.headline_asset
+  end
+
+  test "refuses nodes in the Trash" do
+    @node.trash!(@user)
+    assert_raises(ActiveRecord::RecordInvalid) { @node.attach_asset!(@image, :user => @user) }
+  end
+
+  private
+
+    def create_image_asset
+      Asset.create!(:name => "attach test image", :upload_content_type => "image/png")
+    end
+
+    def create_plain_asset
+      Asset.create!(:name => "attach test note", :upload_content_type => "text/plain")
+    end
+end
diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index d7e4dd0..ba38340 100644
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -546,30 +546,6 @@ class NodeTest < ActiveSupport::TestCase
     assert result.index(mine) < result.index(someone_elses_newer)
   end
 
-  test "recently_changed includes a node whose head was recently published" do
-    node = Node.root.children.create!(:slug => "recent_changed_published")
-    find_or_create_draft(node, @user1)
-    node.autosave!({:title => "v1"}, @user1)
-    node.save_draft!(@user1)
-    node.publish_draft!
-
-    assert_includes Node.recently_changed, node
-  end
-
-  test "recently_changed excludes a node only touched by locking or unlocking after an old publish" do
-    node = Node.root.children.create!(:slug => "recent_changed_lock_only")
-    find_or_create_draft(node, @user1)
-    node.autosave!({:title => "v1"}, @user1)
-    node.save_draft!(@user1)
-    node.publish_draft!
-    node.head.update_column(:updated_at, 20.days.ago)
-
-    node.lock_for_editing!(@user1)
-    node.unlock!
-
-    assert_not_includes Node.recently_changed, node
-  end
-
   test "autosave! carries over the current related assets to the newly created autosave row" do
     node = Node.root.children.create!(:slug => "autosave_asset_carryover_test")
     user = User.find_by_login("quentin")