17 files changed, 1658 insertions, 138 deletions

diff --git a/test/controllers/admin_controller_test.rb b/test/controllers/admin_controller_test.rb
index 9bbf29b..00a51e2 100644
--- a/test/controllers/admin_controller_test.rb
+++ b/test/controllers/admin_controller_test.rb
@@ -1,8 +1,41 @@
 require 'test_helper'
 
 class AdminControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
+  test "current drafts includes nodes with only an autosave" do
+    node = Node.root.children.create!(:slug => "admin_autosave_only")
+    node.lock_for_editing!(User.find_by_login("aaron"))
+    node.autosave!({title: "in progress"}, User.find_by_login("aaron"))
+    node.save_draft!(User.find_by_login("aaron"))
+    node.publish_draft!
+    node.lock_for_editing!(User.find_by_login("aaron"))
+    node.autosave!({title: "editing again"}, User.find_by_login("aaron"))
+
+    login_as :quentin
+    get :index
+    assert_includes assigns(:drafts), node
+  end
+
+  test "dashboard_search returns matching tags and nodes grouped separately" do
+    node = Node.root.children.create!(:slug => "dashboard_search_test")
+    node.find_or_create_draft(User.find_by_login("aaron"))
+    node.draft.update(:title => "Biometrics Workshop")
+    node.draft.tag_list = "biometrics-workshop"
+    node.draft.save!
+
+    login_as :quentin
+    get :dashboard_search, params: { :search_term => "biometr" }, :format => :json
+
+    json = JSON.parse(response.body)
+    assert json["tags"].any? { |t| t["name"] == "biometrics-workshop" }
+    assert json["nodes"].any? { |n| n["title"] == "Biometrics Workshop" }
+  end
+
+  test "dashboard_search returns empty results for a blank term" do
+    login_as :quentin
+    get :dashboard_search, params: { :search_term => "" }, :format => :json
+
+    json = JSON.parse(response.body)
+    assert_equal [], json["tags"]
+    assert_equal [], json["nodes"]
   end
 end
diff --git a/test/controllers/events_controller_test.rb b/test/controllers/events_controller_test.rb
index 14e534e..46f3f4f 100644
--- a/test/controllers/events_controller_test.rb
+++ b/test/controllers/events_controller_test.rb
@@ -1,45 +1,133 @@
 require 'test_helper'
 
 class EventsControllerTest < ActionController::TestCase
-  # test "should get index" do
-  #   get :index
-  #   assert_response :success
-  #   assert_not_nil assigns(:events)
-  # end
-  # 
-  # test "should get new" do
-  #   get :new
-  #   assert_response :success
-  # end
-  # 
-  # test "should create event" do
-  #   assert_difference('Event.count') do
-  #     post :create, params: { :event => { } }
-  #   end
-  # 
-  #   assert_redirected_to event_path(assigns(:event))
-  # end
-  # 
-  # test "should show event" do
-  #   get :show, params: { :id => events(:one).to_param }
-  #   assert_response :success
-  # end
-  # 
-  # test "should get edit" do
-  #   get :edit, params: { :id => events(:one).to_param }
-  #   assert_response :success
-  # end
-  # 
-  # test "should update event" do
-  #   put :update, params: { :id => events(:one).to_param, :event => { } }
-  #   assert_redirected_to event_path(assigns(:event))
-  # end
-  # 
-  # test "should destroy event" do
-  #   assert_difference('Event.count', -1) do
-  #     delete :destroy, params: { :id => events(:one).to_param }
-  #   end
-  # 
-  #   assert_redirected_to events_path
-  # end
+
+  test "should get index" do
+    login_as :quentin
+    node = create_node_with_published_page
+    Event.create!(node_id: node.id, start_time: Time.now, end_time: Time.now + 1.hour)
+
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:events)
+  end
+
+  test "should get new" do
+    login_as :quentin
+    get :new
+    assert_response :success
+  end
+
+  test "new pre-fills tag_list and explains it via flash when auto_tag_source is given" do
+    login_as :quentin
+    node = create_node_with_published_page
+
+    get :new, params: { node_id: node.id, tag_list: "open-day", auto_tag_source: "erfa-detail" }
+
+    assert_response :success
+    assert_equal "open-day", assigns(:event).tag_list.to_s
+    assert_match "open-day", flash[:notice]
+    assert_match "erfa-detail", flash[:notice]
+  end
+
+  test "new does not flash without an auto_tag_source" do
+    login_as :quentin
+
+    get :new, params: { tag_list: "open-day" }
+
+    assert_response :success
+    assert_nil flash[:notice]
+  end
+
+  test "new with no params renders a blank, unflashed form" do
+    login_as :quentin
+
+    get :new
+
+    assert_response :success
+    assert_nil assigns(:event).tag_list.presence
+    assert_nil flash[:notice]
+  end
+
+  test "should show event" do
+    login_as :quentin
+    node  = create_node_with_published_page
+    event = Event.create!(node_id: node.id, start_time: Time.now, end_time: Time.now + 1.hour)
+
+    get :show, params: { id: event.id }
+    assert_response :success
+  end
+
+  test "should get edit" do
+    login_as :quentin
+    node  = create_node_with_published_page
+    event = Event.create!(node_id: node.id, start_time: Time.now, end_time: Time.now + 1.hour)
+
+    get :edit, params: { id: event.id }
+    assert_response :success
+  end
+
+  test "should create event attached to a node" do
+    login_as :quentin
+    node = create_node_with_published_page
+
+    assert_difference('Event.count') do
+      post :create, params: {
+        event: {
+          node_id:    node.id,
+          start_time: Time.now,
+          end_time:   Time.now + 1.hour,
+          tag_list:   "open-day"
+        }
+      }
+    end
+
+    assert_redirected_to edit_node_path(node)
+    assert_equal 'Event was successfully created.', flash[:notice]
+  end
+
+  test "should not create an event without a title or a node_id" do
+    login_as :quentin
+
+    assert_no_difference('Event.count') do
+      post :create, params: { event: { start_time: Time.now, end_time: Time.now + 1.hour } }
+    end
+
+    assert_response :success # re-renders :new, not a redirect
+  end
+
+  test "should honour return_to on create" do
+    login_as :quentin
+    node = create_node_with_published_page
+
+    post :create, params: {
+      event:     { node_id: node.id, start_time: Time.now, end_time: Time.now + 1.hour },
+      return_to: node_path(node)
+    }
+
+    assert_redirected_to node_path(node)
+  end
+
+  test "should update event" do
+    login_as :quentin
+    node  = create_node_with_published_page
+    event = Event.create!(node_id: node.id, start_time: Time.now, end_time: Time.now + 1.hour)
+
+    put :update, params: { id: event.id, event: { title: "Updated title" } }
+
+    assert_redirected_to events_path
+    assert_equal "Updated title", event.reload.title
+  end
+
+  test "should destroy event" do
+    login_as :quentin
+    node  = create_node_with_published_page
+    event = Event.create!(node_id: node.id, start_time: Time.now, end_time: Time.now + 1.hour)
+
+    assert_difference('Event.count', -1) do
+      delete :destroy, params: { id: event.id }
+    end
+
+    assert_redirected_to events_url
+  end
 end
diff --git a/test/controllers/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb
index 53799f1..81e3f45 100644
--- a/test/controllers/nodes_controller_test.rb
+++ b/test/controllers/nodes_controller_test.rb
@@ -9,13 +9,13 @@ class NodesControllerTest < ActionController::TestCase
     get :index
     assert_response :success
   end
-  
+
   def test_new
     login_as :quentin
     get :new
     assert_response :success
   end
-  
+
   test "create generic node with parent_id provided" do
     login_as :quentin
     before_count = Node.count
@@ -33,7 +33,7 @@ class NodesControllerTest < ActionController::TestCase
     assert_equal Node.last.parent_id, Node.root.id
     assert_equal 1, Node.last.level
   end
- 
+
   test "create update node" do
     login_as :quentin
     post(
@@ -45,7 +45,7 @@ class NodesControllerTest < ActionController::TestCase
     )
     assert_response :redirect
   end
-  
+
   test "create top level node" do
     login_as :quentin
     before_count = Node.count
@@ -62,77 +62,79 @@ class NodesControllerTest < ActionController::TestCase
     assert_equal expected, Node.last.unique_name
     assert_equal 1, Node.last.level
   end
-  
+
   test "creating a top_level node without a title should not work" do
     login_as :quentin
-    
+
     assert_no_difference "Node.count" do
       post(:create, params: { :kind => "top_level" } )
     end
   end
-  
+
   test "creating a generic node without a parent_id should not work" do
     login_as :quentin
-    
+
     assert_no_difference "Node.count" do
       post(:create, params: { :kind => "generic" } )
     end
   end
-  
+
   test "editing a node" do
     login_as :quentin
-    
+
     node = Node.find_by_unique_name("fourth_child")
     node.pages.create
     node.draft = node.pages.last
     node.save
-    
+
     assert_equal 1, node.pages.length
-    
+
     draft = node.find_or_create_draft( User.first )
     draft.title = "Hello"
     draft.body = "World"
     draft.save
     node.publish_draft!
-    
+
     get :edit, params: { :id => node.id }
     assert_response :success
     assert_select("#page_title[value='Hello']")
     assert_select("#page_body", "World")
-    
+
     node.reload
-    assert_equal 2, node.pages.length
+    assert_equal 1, node.pages.length
     assert_equal "Hello", node.find_or_create_draft( User.first ).title
     assert_equal "World", node.find_or_create_draft( User.first ).body
   end
-  
+
   test "editing a locked node raises LockedByAnotherUser Exception" do
     login_as :quentin
-    
+
     node = create_node_with_draft
     node.lock_owner = User.last
     node.save
-    
+
     assert node.locked?
-    
+
     get :edit, params: { :id => node.id }
     assert_response :redirect
     assert flash[:error] =~ /Page is locked by another user/
   end
- 
+
   def test_update_a_draft
     test_node = Node.root.children.create! :slug => "test_node"
     login_as :quentin
+    get :edit, params: { :id => test_node.id }
     put :update, params: { :id => test_node.id, :page => {:title => "Hello", :body => "There"} }
     test_node.reload
     assert_equal "Hello", test_node.draft.title
     assert_equal "There", test_node.draft.body
   end
-  
+
   def test_update_a_draft_with_changing_the_template
     test_node = Node.root.children.create! :slug => "test_node"
 
     login_as :quentin
+    get :edit, params: { :id => test_node.id }
     put :update, params: {
       :id => test_node.id,
       :page => {
@@ -148,19 +150,19 @@ class NodesControllerTest < ActionController::TestCase
     assert_equal "There", test_node.head.body
     assert_equal "Foobar", test_node.head.template_name
   end
-  
+
   test "publish draft with staged_slug unqueal slug" do
     login_as :quentin
-    
+
     test_node = Node.root.children.create! :slug => "test_node", :staged_slug => "peter_pan"
-    
+
     put :publish, params: { :id => test_node.id }
-    
+
     test_node.reload
     assert_equal "peter_pan", test_node.slug
     assert_equal "peter_pan", test_node.unique_name
   end
-  
+
   test "publish draft with staged_slug with more levels of nodes" do
     login_as :quentin
 
@@ -168,12 +170,12 @@ class NodesControllerTest < ActionController::TestCase
     test_node2 = test_node.children.create! :slug => "test_node2"
 
     put :publish, params: { :id => test_node.id }
-    
+
     test_node.reload; test_node2.reload
     assert_equal "peter_pan/test_node2", test_node2.unique_name
     assert_equal "peter_pan", test_node.unique_name
   end
- 
+
   test "publish draft with staged_parent_id" do
     login_as :quentin
 
@@ -187,77 +189,77 @@ class NodesControllerTest < ActionController::TestCase
     assert_equal "parent/test_node", test_node.unique_name
     assert_equal "parent/test_node/test_node2", test_node2.unique_name
   end
-  
+
   test "publish draft with staged_parent_id and staged_slug" do
     login_as :quentin
-    
+
     parent = Node.root.children.create! :slug => "parent"
-    
+
     test_node = Node.root.children.create!(
-      :slug => "test_node", 
+      :slug => "test_node",
       :staged_parent_id => parent.id,
       :staged_slug => "peter_pan"
     )
-    
+
     test_node2 = test_node.children.create! :slug => "test_node2"
-    
+
     put :publish, params: { :id => test_node.id }
-    
+
     test_node.reload; test_node2.reload
     assert_equal "parent/peter_pan", test_node.unique_name
     assert_equal "parent/peter_pan/test_node2", test_node2.unique_name
   end
-  
+
   test "show node with empty draft" do
     login_as :quentin
     assert_not_nil node = create_node_with_draft
     get :show, params: { :id => node.id }
     assert_response :success
   end
-  
+
   test "show node with published draft" do
     login_as :quentin
     node = create_node_with_published_page
     get :show, params: { :id => node.id }
     assert_response :success
-    assert_select "td", :text => "Test", :count =>  3
+    assert_select "div.node_content", :text => "Test", :count => 2
   end
-  
+
   test "unlocking a locked node" do
     login_as :quentin
     node = create_node_with_published_page
     node.find_or_create_draft User.first
-    
+
     assert node.locked?
-    
+
     put :unlock, params: { :id => node.id }
     assert_response :redirect
     assert !node.reload.locked?
   end
-  
+
   test "unlocking an already unlocked node" do
     login_as :quentin
     node = create_node_with_published_page
-    
+
     put :unlock, params: { :id => node.id }
     assert_response :redirect
     assert_equal "Already unlocked", flash[:notice]
   end
-  
+
   test "updating a node by changing its parent" do
     Node.root.descendants.destroy_all
     login_as :quentin
     node = create_node_with_published_page
     node.find_or_create_draft User.first
-    
+
     other_node = Node.root.children.create( :slug => "other" )
-    
+
     node.staged_parent_id = other_node.id
     node.publish_draft!
 
     assert Node.valid?
   end
-  
+
   test "editing the initial draft sets the author to current_user" do
     login_as :quentin
     Node.root.descendants.destroy_all
@@ -266,7 +268,7 @@ class NodesControllerTest < ActionController::TestCase
     node.reload
     assert_equal "quentin", node.draft.user.login
   end
-  
+
   test "updating the author of a node with existing head" do
     login_as :quentin
     Node.root.descendants.destroy_all
@@ -275,70 +277,73 @@ class NodesControllerTest < ActionController::TestCase
     node.find_or_create_draft users(:quentin)
     assert node.draft.valid?
     assert node.valid?
-    
+
     put :update, params: { :id => node.id, :page => {:user_id => users(:aaron).id} }
     assert_response :redirect
     assert_equal "aaron", node.reload.draft.user.login
   end
-  
+
   test "updating an existing page should not modify published_at" do
     login_as :quentin
     Node.root.descendants.destroy_all
     node  = create_node_with_published_page
-    
+
     get :edit, params: { :id => node.id }
     assert_response :success
-    
+
+    put :update,  params: { :id => node.id, :page => { :title => "updated" } }
     put :publish, params: { :id => node.id }
-    
+
     node.reload
     assert_equal node.pages[0].published_at, node.pages[1].published_at
   end
-  
+
   test "updating an exisiting page should not alter the author" do
     login_as :aaron
     Node.root.descendants.destroy_all
     node  = create_node_with_published_page
     get :edit,    params: { :id => node.id }
-    
+
+    put :update,  params: { :id => node.id, :page => { :title => "updated" } }
     put :publish, params: { :id => node.id }
-    
+
     node.reload
     assert_equal node.pages[0].user, node.pages[1].user
   end
-  
+
   test "editor and author are the same on a new node" do
     login_as :quentin
     node = create_node_with_draft
     get :edit, params: { :id => node.id }
-    
+
     node.reload
     assert_equal "quentin", node.draft.user.login
     assert_equal "quentin", node.draft.editor.login
   end
-  
+
   test "creating new draft alters the editor but keeps the author" do
     node = create_node_with_published_page
     assert_equal "quentin", node.head.user.login
-    
+
     login_as :aaron
-    get :edit,  params: {:id => node.id }
-    
+    get :edit,   params: { :id => node.id }
+    put :update, params: { :id => node.id, :page => { :title => "updated" } }
+
     node.reload
     assert_equal "quentin", node.head.user.login
     assert_equal "aaron",   node.draft.editor.login
   end
-  
+
   test "unlocking and relocking changes editor if done by another user" do
     node  = create_node_with_published_page
     draft = node.find_or_create_draft users(:quentin)
     assert_equal draft.user.login, draft.editor.login
     assert node.locked?
     node.unlock!
-    
+
     login_as :aaron
     get :edit, params: { :id => node.id }
-    
+
     node.reload
     assert_equal "quentin", node.draft.user.login
     assert_equal "aaron", node.draft.editor.login
@@ -350,6 +355,7 @@ class NodesControllerTest < ActionController::TestCase
 
     login_as :quentin
     get :index
+    assert_response :success
   end
 
   test "no dangling pages remain after node removal" do
@@ -364,7 +370,7 @@ class NodesControllerTest < ActionController::TestCase
 
   test "can remove a node with an event" do
     node = create_node_with_published_page
-    Event.create!(
+    event = Event.create!(
       :start_time   => "2009-01-01T15:23:42".to_time,
       :end_time     => "2009-01-01T20:05:23".to_time,
       :url          => "http://events.ccc.de/congress/2082",
@@ -373,10 +379,272 @@ class NodesControllerTest < ActionController::TestCase
       :allday       => true,
       :node_id      => node.id
     )
+    event_id = event.id
+    assert_operator Occurrence.where(event_id: event_id).count, :>, 0, "expected the event to have generated at least one occurrence before destroy"
+
     node.destroy
 
+    assert_equal 0, Occurrence.where(event_id: event_id).count
+
     login_as :quentin
     get :index
+    assert_response :success
+  end
+
+  test "show renders events row and add-link for zero-event chapter node" do
+    login_as :quentin
+    node = create_node_with_published_page
+    node.head.tag_list = "erfa-detail"
+    node.head.save!
+
+    get :show, params: { id: node.id }
+    assert_response :success
+    assert_select "a", text: "add event"
+    assert_select "a[href*='tag_list=open-day']"
+    assert_select "a[href*='auto_tag_source=erfa-detail']"
+  end
+
+  test "show renders events row without a tag default for untagged node" do
+    login_as :quentin
+    node = create_node_with_published_page
+
+    get :show, params: { id: node.id }
+    assert_response :success
+    assert_select "a", text: "add event"
+    assert_select "a[href*='tag_list=']", count: 0
+  end
+
+  test "show never renders a destroy link for events" do
+    login_as :quentin
+    node = create_node_with_published_page
+    Event.create!(node_id: node.id, start_time: Time.now, end_time: Time.now + 1.hour)
+
+    get :show, params: { id: node.id }
+    assert_response :success
+    assert_select "form.button_to.destructive", count: 0
+  end
+
+  test "reverting from nodes#show returns to the show page, not the editor, even if a draft remains" do
+    user = User.find_by_login("aaron")
+    node = Node.root.children.create!(:slug => "revert_return_to_test")
+    node.lock_for_editing!(user)
+    node.autosave!({:title => "v1"}, user)
+    node.save_draft!(user)
+    node.publish_draft!
+    node.lock_for_editing!(user)
+    node.autosave!({:title => "v2"}, user)
+    node.save_draft!(user)
+    node.lock_for_editing!(user)
+    node.autosave!({:title => "v3"}, user)
+    # state D: head, draft, and autosave all present, locked by aaron
+
+    login_as :aaron
+    put :revert, params: { :id => node.id, :return_to => node_path(node) }
+    assert_redirected_to node_path(node)
+    node.reload
+    assert node.draft.present?
+    assert node.autosave.blank?
+  end
+
+  test "reverting from nodes#edit without return_to still lands back in the editor when a draft remains" do
+    user = User.find_by_login("aaron")
+    node = Node.root.children.create!(:slug => "revert_default_test")
+    node.lock_for_editing!(user)
+    node.autosave!({:title => "v1"}, user)
+    node.save_draft!(user)
+    node.publish_draft!
+    node.lock_for_editing!(user)
+    node.autosave!({:title => "v2"}, user)
+    node.save_draft!(user)
+    node.lock_for_editing!(user)
+    node.autosave!({:title => "v3"}, user)
+
+    login_as :aaron
+    put :revert, params: { :id => node.id }
+    assert_redirected_to edit_node_path(node)
+  end
+
+  test "nodes#show does not offer to destroy the only draft of a never-published node" do
+    node = Node.root.children.create!(:slug => "draft_only_test")
+    login_as :quentin
+    get :show, params: { :id => node.id }
+    assert_response :success
+    assert_select "form.destructive", :count => 0
+  end
+
+  test "drafts includes a never-published node with only a draft" do
+    node = Node.root.children.create!(:slug => "drafts_action_test")
+    login_as :quentin
+    get :drafts
+    assert_includes assigns(:nodes), node
+  end
+
+  test "chapters filters by kind, matching head or draft, and shows both by default" do
+    erfa_node = Node.root.children.create!(:slug => "chapters_erfa_test")
+    erfa_node.find_or_create_draft(@user1)
+    erfa_node.draft.tag_list = "erfa-detail"
+    erfa_node.draft.save!
+    erfa_node.publish_draft!
+
+    chaostreff_node = Node.root.children.create!(:slug => "chapters_chaostreff_test")
+    chaostreff_node.find_or_create_draft(@user1)
+    chaostreff_node.draft.tag_list = "chaostreff-detail"
+    chaostreff_node.draft.save!
+    chaostreff_node.publish_draft!
+
+    login_as :quentin
+
+    get :chapters, params: { :kinds => "erfa" }
+    assert_includes assigns(:nodes), erfa_node
+    assert_not_includes assigns(:nodes), chaostreff_node
+
+    get :chapters
+    assert_includes assigns(:nodes), erfa_node
+    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" }
+    assert_response :success
+  end
+
+  test "mine combined with a search term does not raise an ambiguous column error" do
+    login_as :quentin
+    get :mine, params: { :q => "Zombies" }
+    assert_response :success
+  end
+
+  test "mine shows each matching node only once, even with several revisions by the same user" do
+    login_as :quentin
+    user = User.find_by_login("quentin")
+    node = Node.root.children.create!(:slug => "dedup_test")
+    node.lock_for_editing!(user)
+    node.autosave!({:title => "v1"}, user)
+    node.save_draft!(user)
+    node.publish_draft!
+    node.lock_for_editing!(user)
+    node.autosave!({:title => "v2"}, user)
+    node.save_draft!(user)
+    node.publish_draft!
+    # three pages now exist on this node, all touched by quentin --
+    # without DISTINCT, the join would return this node three times
+
+    get :mine
+    matches = assigns(:nodes).select { |n| n.id == node.id }
+    assert_equal 1, matches.length
+  end
+
+  test "chapters combined with a search term does not raise an ambiguous column error" do
+    login_as :quentin
+    get :chapters, params: { :q => "Zombies" }
+    assert_response :success
+  end
+
+  test "tags path filters by an arbitrary raw tag, generalizing chapters" do
+    presse_node = Node.root.children.create!(:slug => "tags_path_presse_test")
+    presse_node.find_or_create_draft(@user1)
+    presse_node.draft.tag_list = "pressemitteilung"
+    presse_node.draft.save!
+    presse_node.publish_draft!
+
+    erfa_node = Node.root.children.create!(:slug => "tags_path_erfa_test")
+    erfa_node.find_or_create_draft(@user1)
+    erfa_node.draft.tag_list = "erfa-detail"
+    erfa_node.draft.save!
+    erfa_node.publish_draft!
+
+    login_as :quentin
+    get :tags, params: { :tags => "pressemitteilung" }
+
+    assert_includes assigns(:nodes), presse_node
+    assert_not_includes assigns(:nodes), erfa_node
+
+    assert_select "h1", "Nodes tagged: pressemitteilung"
+    assert_select "h1", :text => "Chapters", :count => 0
+  end
+
+  test "tags path with multiple tags matches any of them, not all" do
+    erfa_node = Node.root.children.create!(:slug => "tags_path_multi_erfa_test")
+    erfa_node.find_or_create_draft(@user1)
+    erfa_node.draft.tag_list = "erfa-detail"
+    erfa_node.draft.save!
+    erfa_node.publish_draft!
+
+    chaostreff_node = Node.root.children.create!(:slug => "tags_path_multi_chaostreff_test")
+    chaostreff_node.find_or_create_draft(@user1)
+    chaostreff_node.draft.tag_list = "chaostreff-detail"
+    chaostreff_node.draft.save!
+    chaostreff_node.publish_draft!
+
+    login_as :quentin
+    get :tags, params: {:tags => "erfa-detail,chaostreff-detail" }
+
+    assert_includes assigns(:nodes), erfa_node
+    assert_includes assigns(:nodes), chaostreff_node
+  end
+
+  test "chapters renders the curated heading" do
+    login_as :quentin
+    get :chapters
+    assert_select "h1", "Chapters"
+  end
+
+  test "sitemap collapses configured paths but leaves others open" do
+    club = Node.root.children.create!(:slug => "club")
+    erfas = club.children.create!(:slug => "erfas")
+    erfas.children.create!(:slug => "one_chapter")
+    other = Node.root.children.create!(:slug => "sitemap_controller_open_test")
+    other.children.create!(:slug => "sitemap_controller_open_child")
+
+    login_as :quentin
+    get :sitemap
+    assert_response :success
+
+    doc = Nokogiri::HTML::DocumentFragment.parse(response.body)
+
+    erfas_node_div = doc.css('.sitemap_node').find { |div| div.at_css('.field_hint')&.text&.include?(erfas.unique_name) }
+    other_node_div = doc.css('.sitemap_node').find { |div| div.at_css('.field_hint')&.text&.include?(other.unique_name) }
+
+    erfas_details = erfas_node_div.next_element
+    other_details = other_node_div.next_element
+
+    assert_equal 'details', erfas_details.name
+    assert_equal 'details', other_details.name
+    assert_not erfas_details.key?('open')
+    assert other_details.key?('open')
+  end
+
+  test "sitemap shows how many descendants a collapsed branch is hiding" do
+    club = Node.root.children.create!(:slug => "club")
+    erfas = club.children.create!(:slug => "erfas")
+    erfas.children.create!(:slug => "one_chapter")
+    erfas.children.create!(:slug => "another_chapter")
+
+    login_as :quentin
+    get :sitemap
+    assert_response :success
+
+    doc = Nokogiri::HTML::DocumentFragment.parse(response.body)
+    erfas_node_div = doc.css('.sitemap_node').find { |div| div.at_css('.field_hint')&.text&.include?(erfas.unique_name) }
+    erfas_details = erfas_node_div.next_element
+
+    assert_equal 'details', erfas_details.name
+    assert_match "2 descendants", erfas_details.at_css('summary').text
+  end
+
+  test "sitemap shows Show and Create Child, not Revisions" do
+    node = Node.root.children.create!(:slug => "sitemap_actions_test")
+    login_as :quentin
+    get :sitemap
+    assert_select ".sitemap_node_actions", :text => /Show/
+    assert_select ".sitemap_node_actions", :text => /Create Child/
+    assert_select ".sitemap_node_actions", :text => /Revisions/, :count => 0
+  end
 end
diff --git a/test/controllers/page_translations_controller_test.rb b/test/controllers/page_translations_controller_test.rb
new file mode 100644
index 0000000..8c899fd
--- /dev/null
+++ b/test/controllers/page_translations_controller_test.rb
@@ -0,0 +1,97 @@
+require 'test_helper'
+
+class PageTranslationsControllerTest < ActionController::TestCase
+  test "index lists the default locale's existing translation and flags a missing one" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "translations_index_test")
+    node.publish_draft!
+
+    get :index, params: { :node_id => node.id }
+
+    assert_response :success
+    assert_equal [:en], assigns(:translations).map { |t| t[:locale] }
+    assert_equal false, assigns(:translations).first[:exists]
+  end
+
+  test "update creates a first-time translation on a fresh draft, leaving head untouched" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "translations_create_test")
+    Globalize.with_locale(:de) { node.draft.update!(:title => "Deutscher Titel") }
+    node.publish_draft!
+    node.lock_for_editing!(users(:quentin))
+
+    patch :update, params: { :node_id => node.id, :translation_locale => "en", :page => { :title => "English Title" } }
+
+    node.reload
+    assert_not_nil node.draft
+    assert_includes node.draft.translated_locales, :en
+    assert_not_includes node.head.translated_locales, :en
+  end
+
+  test "no route exists for the default locale under the translations resource" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "translations_route_constraint_test")
+
+    assert_raises(ActionController::UrlGenerationError) do
+      patch :update, params: { :node_id => node.id, :translation_locale => "de", :page => { :title => "x" } }
+    end
+  end
+
+  test "update with Save + Unlock + Exit unlocks the node and redirects to nodes#show" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "translations_exit_test")
+    node.lock_for_editing!(users(:quentin))
+
+    patch :update, params: { :node_id => node.id, :translation_locale => "en", :page => { :title => "x" }, :commit => "Save + Unlock + Exit" }
+
+    assert_nil node.reload.lock_owner
+    assert_redirected_to node_path(node)
+  end
+
+  test "update saves the translation onto the draft" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "translations_update_test")
+    Globalize.with_locale(:en) { node.draft.update!(:title => "Original") }
+    node.lock_for_editing!(users(:quentin))
+
+    patch :update, params: { :node_id => node.id, :translation_locale => "en", :page => { :title => "Revised" } }
+
+    assert_equal "Revised", Globalize.with_locale(:en) { node.draft.reload.title }
+  end
+
+  test "destroy refuses to remove the only remaining translation" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "translations_destroy_last_test")
+    Globalize.with_locale(:en) { node.draft.update!(:title => "Only translation") }
+    node.draft.translations.where(:locale => :de).delete_all
+
+    delete :destroy, params: { :node_id => node.id, :translation_locale => "en" }
+
+    assert_equal "Can't remove the only remaining translation.", flash[:error]
+  end
+
+  test "destroy is a safe no-op, not a false success, when the translation doesn't exist" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "translations_destroy_missing_test")
+
+    delete :destroy, params: { :node_id => node.id, :translation_locale => "en" }
+
+    assert_match(/No EN translation exists/, flash[:error])
+  end
+
+  test "autosave writes the translation without creating a new revision or touching the draft" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "translations_autosave_test")
+    node.publish_draft!
+    node.lock_for_editing!(users(:quentin))
+    page_count_before = node.pages.count
+
+    put :autosave, params: { :node_id => node.id, :translation_locale => "en", :page => { :title => "in progress" } }
+
+    assert_response :success
+    node.reload
+    assert_not_nil node.autosave
+    assert_equal page_count_before, node.pages.count
+    assert_equal "in progress", Globalize.with_locale(:en) { node.autosave.title }
+  end
+end
diff --git a/test/controllers/related_assets_controller_test.rb b/test/controllers/related_assets_controller_test.rb
new file mode 100644
index 0000000..9d20cbb
--- /dev/null
+++ b/test/controllers/related_assets_controller_test.rb
@@ -0,0 +1,91 @@
+require 'test_helper'
+
+class RelatedAssetsControllerTest < ActionController::TestCase
+  test "search finds assets by name, excluding ones already attached" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "related_assets_search_test")
+
+    attached = Asset.create!(:name => "biometrics-scan", :upload_content_type => "image/png")
+    node.draft.assets << attached
+
+    Asset.create!(:name => "biometrics-poster", :upload_content_type => "image/png")
+    Asset.create!(:name => "chaostreff-flyer", :upload_content_type => "image/png")
+
+    get :search, params: { :node_id => node.id, :search_term => "biometrics" }
+
+    json = JSON.parse(response.body)
+    names = json.map { |a| a["name"] }
+    assert_includes names, "biometrics-poster"
+    assert_not_includes names, "biometrics-scan"
+    assert_not_includes names, "chaostreff-flyer"
+  end
+
+  test "search with a blank term returns the most recently created assets" do
+    Asset.delete_all
+    RelatedAsset.delete_all
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "related_assets_recent_test")
+
+    Asset.create!(:name => "older-photo", :upload_content_type => "image/png", :created_at => 2.days.ago)
+    Asset.create!(:name => "newer-photo", :upload_content_type => "image/png", :created_at => 1.hour.ago)
+
+    get :search, params: { :node_id => node.id, :search_term => "" }
+
+    json = JSON.parse(response.body)
+    assert_equal ["newer-photo", "older-photo"], json.map { |a| a["name"] }
+  end
+
+  test "create attaches an asset to the node's editable page" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "related_assets_create_test")
+    asset = Asset.create!(:name => "erfa-photo", :upload_content_type => "image/png")
+
+    post :create, params: { :node_id => node.id, :asset_id => asset.id }
+
+    assert_response :success
+    assert_includes node.draft.reload.related_assets.map(&:asset_id), asset.id
+    json = JSON.parse(response.body)
+    assert json["url"].present?
+  end
+
+  test "create does not duplicate an already-attached asset" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "related_assets_dup_test")
+    asset = Asset.create!(:name => "erfa-photo-2", :upload_content_type => "image/png")
+    node.draft.assets << asset
+
+    post :create, params: { :node_id => node.id, :asset_id => asset.id }
+
+    assert_response :success
+    assert_equal 1, node.draft.reload.related_assets.count
+  end
+
+  test "destroy removes the attached asset" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "related_assets_destroy_test")
+    asset = Asset.create!(:name => "old-photo", :upload_content_type => "image/png")
+    node.draft.assets << asset
+    related = node.draft.related_assets.first
+
+    delete :destroy, params: { :node_id => node.id, :id => related.id }
+
+    assert_response :success
+    assert_equal 0, node.draft.reload.related_assets.count
+  end
+
+  test "update reorders the attached assets" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "related_assets_reorder_test")
+    first  = Asset.create!(:name => "first-photo", :upload_content_type => "image/png")
+    second = Asset.create!(:name => "second-photo", :upload_content_type => "image/png")
+    node.draft.assets << first
+    node.draft.assets << second
+
+    second_related = node.draft.related_assets.find_by(:asset_id => second.id)
+    patch :update, params: { :node_id => node.id, :id => second_related.id, :position => 1 }
+
+    assert_response :success
+    ordered_asset_ids = node.draft.reload.related_assets.map(&:asset_id)
+    assert_equal [second.id, first.id], ordered_asset_ids
+  end
+end
diff --git a/test/controllers/revisions_controller_test.rb b/test/controllers/revisions_controller_test.rb
index b4dcd8f..e5726f7 100644
--- a/test/controllers/revisions_controller_test.rb
+++ b/test/controllers/revisions_controller_test.rb
@@ -1,12 +1,12 @@
 require 'test_helper'
 
 class RevisionsControllerTest < ActionController::TestCase
-  
+
   def setup
     Node.root.descendants.destroy_all
     @user = User.find_by_login("aaron")
     @node = Node.root.children.create!( :slug => "version_me" )
-    
+
     draft = @node.draft
     draft.body = "first"
     @node.publish_draft!
@@ -15,48 +15,189 @@ class RevisionsControllerTest < ActionController::TestCase
     draft.update(:body => "second")
     @node.publish_draft!
   end
-  
+
   test "setup" do
     assert_equal 2, Node.count
     assert_equal 2, @node.pages.count
     assert_equal ["first", "second"], @node.pages.map {|p| p.body}
   end
-  
+
   test "get list of revisions for a given node" do
     login_as :quentin
     get :index, params: { :node_id => @node.id }
     assert_response :success
     assert_select ".revision", 2
   end
-  
-  test "showing one revision" do
+
+   test "showing one revision" do
     login_as :quentin
     get :show, params: { :node_id => @node.id, :id => @node.pages.last.id }
     assert_response :success
-    assert_select "strong", "Body"
-    assert_select "td", {:count => 1, :text => "second"}
+    assert_select ".node_description", "Body"
+    assert_select ".node_content", {:count => 1, :text => "second"}
+  end
+
+  test "showing a revision renders real markup in the body, not escaped entities" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "show_markup_test")
+    draft = node.draft
+    draft.body = "<h3>Hello</h3>"
+    node.publish_draft!
+
+    get :show, params: { :node_id => node.id, :id => node.head.id }
+    assert_response :success
+    assert_select ".node_content h3", "Hello"
   end
-  
+
   test "diffing two revisions" do
     login_as :quentin
     post(
       :diff, params: {
         :node_id => @node.id,
-        :start_revision => @node.pages.first.revision, 
+        :start_revision => @node.pages.first.revision,
         :end_revision => @node.pages.last.revision
       }
     )
     assert_response :success
   end
-  
+
   test "restoring a revision" do
     assert_equal "second", @node.head.body
-    
+
     login_as :aaron
     put( :restore, params: { :node_id => @node.id, :id => @node.pages.first.id } )
-    
+
     @node.reload
     assert_equal @node.head, @node.pages.first
     assert_equal "first", @node.head.reload.body
   end
+
+  test "diffing two revisions renders real markup with only the changed words marked" do
+    login_as :quentin
+    post(
+      :diff, params: {
+        :node_id => @node.id,
+        :start_revision => @node.pages.first.revision,
+        :end_revision => @node.pages.last.revision
+      }
+    )
+    assert_response :success
+    assert_select "del", "first"
+    assert_select "ins", "second"
+    assert_no_match /&lt;/, response.body
+  end
+
+  test "diffing two revisions in side by side view renders two columns" do
+    login_as :quentin
+    post(
+      :diff, params: {
+        :node_id => @node.id,
+        :start_revision => @node.pages.first.revision,
+        :end_revision => @node.pages.last.revision,
+        :view => "side_by_side"
+      }
+    )
+    assert_response :success
+    assert_select ".diff_column", 2
+  end
+
+  test "diffing head against draft by name" do
+    login_as :quentin
+    @node.find_or_create_draft(@user)
+    @node.draft.update(:body => "draft body")
+
+    post(:diff, params: { :node_id => @node.id, :start_revision => "head", :end_revision => "draft" })
+    assert_response :success
+  end
+
+  test "diffing a layer pair that no longer exists redirects with a flash" do
+    login_as :quentin
+    post(:diff, params: { :node_id => @node.id, :start_revision => "draft", :end_revision => "autosave" })
+    assert_redirected_to node_path(@node)
+    assert flash[:error].present?
+  end
+
+  test "diffing by name shows a clear comparison label instead of a misleading revision picker" do
+    login_as :quentin
+    @node.find_or_create_draft(@user)
+
+    post(:diff, params: { :node_id => @node.id, :start_revision => "head", :end_revision => "draft" })
+    assert_response :success
+    assert_select "strong", "Head"
+    assert_select "strong", "Draft"
+    assert_select "select[name=?]", "start_revision", :count => 0
+  end
+
+  test "pair-switcher buttons carry their params as real hidden fields, not a query string" do
+    login_as :quentin
+    @node.find_or_create_draft(@user)
+    @node.lock_for_editing!(@user)
+    @node.autosave!({ :body => "unsaved" }, @user)
+
+    post(:diff, params: { :node_id => @node.id, :start_revision => "head", :end_revision => "draft" })
+    assert_response :success
+    assert_select "form.computation input[type=hidden][name=start_revision]"
+    assert_select "form.computation input[type=hidden][name=end_revision]"
+  end
+
+  test "the view toggle is available even when comparing named layers" do
+    login_as :quentin
+    @node.find_or_create_draft(@user)
+
+    post(:diff, params: { :node_id => @node.id, :start_revision => "head", :end_revision => "draft" })
+    assert_response :success
+    assert_select "a", "Side by side"
+  end
+
+  test "diffing two revisions also shows tag, template, and asset changes" do
+    login_as :quentin
+    @node.find_or_create_draft(@user)
+    @node.draft.tag_list = "update"
+    @node.draft.save!
+
+    post(:diff, params: { :node_id => @node.id, :start_revision => @node.pages.first.revision, :end_revision => @node.pages.last.revision })
+    assert_response :success
+    assert_select "h3", "Tags"
+    assert_select "h3", "Template"
+    assert_select "h3", "Assets"
+  end
+
+  test "revisions#index links back to the node" do
+    login_as :quentin
+    get :index, params: { :node_id => @node.id }
+    assert_response :success
+    assert_select "a[href=?]", node_path(@node)
+  end
+
+  test "diff defaults to a locale that actually changed, not the ambient default" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "diff_default_locale_test")
+    node.draft.save!
+    node.publish_draft!
+
+    node.find_or_create_draft(@user)
+    Globalize.with_locale(:en) { node.draft.update!(:title => "Changed in English only") }
+    node.draft.save!
+
+    post(:diff, params: { :node_id => node.id, :start_revision => "head", :end_revision => "draft" })
+
+    assert_response :success
+    assert_match(/Changed/, response.body)
+  end
+
+  test "diff respects an explicitly requested locale over the auto-detected one" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "diff_explicit_locale_test")
+    node.draft.save!
+    node.publish_draft!
+
+    node.find_or_create_draft(@user)
+    Globalize.with_locale(:en) { node.draft.update!(:title => "English changed") }
+    node.draft.save!
+
+    post(:diff, params: { :node_id => node.id, :start_revision => "head", :end_revision => "draft", :locale => "de" })
+
+    assert_response :success
+    assert_no_match(/English changed/, response.body)
+  end
 end
diff --git a/test/controllers/shared_previews_controller_test.rb b/test/controllers/shared_previews_controller_test.rb
new file mode 100644
index 0000000..5f2d20d
--- /dev/null
+++ b/test/controllers/shared_previews_controller_test.rb
@@ -0,0 +1,35 @@
+require 'test_helper'
+
+class SharedPreviewsControllerTest < ActionController::TestCase
+  test "renders the preview for a draft that is current but not yet head" do
+    node = Node.root.children.create!(:slug => "shared_preview_draft_test")
+    node.draft.ensure_preview_token!
+
+    get :show, params: { :token => node.draft.preview_token }
+
+    assert_response :success
+  end
+
+  test "renders the preview for a brand-new draft on an already-published node" do
+    node = Node.root.children.create!(:slug => "shared_preview_published_node_test")
+    node.publish_draft!
+    node.find_or_create_draft(User.first)
+    node.draft.ensure_preview_token!
+
+    get :show, params: { :token => node.draft.preview_token }
+
+    assert_response :success
+  end
+
+  test "redirects to the live page once the previewed draft has been published and become head" do
+    node = Node.root.children.create!(:slug => "shared_preview_now_head_test")
+    node.draft.ensure_preview_token!
+    token = node.draft.preview_token
+
+    node.publish_draft!
+
+    get :show, params: { :token => token }
+
+    assert_redirected_to node.head.public_link
+  end
+end
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 5cd5ad4..58f8a86 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -13,7 +13,7 @@ class UsersControllerTest < ActionController::TestCase
     login_as :aaron
     get :index
     assert_response :success
-    assert_select "button[type=submit]", "destroy"
+    assert_select "button[type=submit]", "Destroy"
     assert_select "a", "show"
   end
   
diff --git a/test/models/concerns/rrule_humanizer_test.rb b/test/models/concerns/rrule_humanizer_test.rb
new file mode 100644
index 0000000..279ff73
--- /dev/null
+++ b/test/models/concerns/rrule_humanizer_test.rb
@@ -0,0 +1,99 @@
+require 'test_helper'
+
+class RruleHumanizerTest < ActiveSupport::TestCase
+  def humanize(rrule, locale = :de)
+    Event.new(rrule: rrule).humanize_rrule(locale)
+  end
+
+  test "weekly single day" do
+    assert_equal "Jeden Dienstag", humanize("FREQ=WEEKLY;BYDAY=TU")
+    assert_equal "Every Tuesday", humanize("FREQ=WEEKLY;BYDAY=TU", :en)
+  end
+
+  test "weekly two days" do
+    assert_equal "Jeden Mittwoch und Freitag", humanize("FREQ=WEEKLY;BYDAY=WE,FR")
+    assert_equal "Every Wednesday and Friday", humanize("FREQ=WEEKLY;BYDAY=WE,FR", :en)
+  end
+
+  test "weekly no byday" do
+    assert_equal "Wöchentlich", humanize("FREQ=WEEKLY")
+    assert_equal "Weekly", humanize("FREQ=WEEKLY", :en)
+  end
+
+  test "biweekly with day" do
+    assert_equal "Alle zwei Wochen donnerstags", humanize("FREQ=WEEKLY;INTERVAL=2;BYDAY=TH")
+    assert_equal "Every other Thursday", humanize("FREQ=WEEKLY;INTERVAL=2;BYDAY=TH", :en)
+  end
+
+  test "biweekly no day" do
+    assert_equal "Alle zwei Wochen", humanize("FREQ=WEEKLY;INTERVAL=2")
+    assert_equal "Every other week", humanize("FREQ=WEEKLY;INTERVAL=2", :en)
+  end
+
+  test "monthly nth weekday" do
+    assert_equal "Jeden ersten Dienstag im Monat", humanize("FREQ=MONTHLY;BYDAY=1TU")
+    assert_equal "Jeden zweiten Freitag im Monat", humanize("FREQ=MONTHLY;BYDAY=2FR")
+    assert_equal "Jeden dritten Sonntag im Monat", humanize("FREQ=MONTHLY;BYDAY=3SU")
+    assert_equal "Jeden letzten Mittwoch im Monat", humanize("FREQ=MONTHLY;BYDAY=-1WE")
+  end
+
+  test "monthly nth weekday english" do
+    assert_equal "Every first Tuesday of the month", humanize("FREQ=MONTHLY;BYDAY=1TU", :en)
+    assert_equal "Every last Wednesday of the month", humanize("FREQ=MONTHLY;BYDAY=-1WE", :en)
+  end
+
+  test "monthly second-to-last" do
+    assert_equal "Jeden vorletzten Donnerstag im Monat", humanize("FREQ=MONTHLY;BYDAY=-2TH")
+    assert_equal "Every second-to-last Thursday of the month", humanize("FREQ=MONTHLY;BYDAY=-2TH", :en)
+  end
+
+  test "monthly no byday" do
+    assert_equal "Monatlich", humanize("FREQ=MONTHLY")
+    assert_equal "Monthly", humanize("FREQ=MONTHLY", :en)
+  end
+
+  test "monthly with single excluded month" do
+    assert_equal "Jeden letzten Donnerstag im Monat, außer im Dezember",
+      humanize("FREQ=MONTHLY;BYDAY=-1TH;BYMONTH=1,2,3,4,5,6,7,8,9,10,11")
+    assert_equal "Every last Thursday of the month, except in December",
+      humanize("FREQ=MONTHLY;BYDAY=-1TH;BYMONTH=1,2,3,4,5,6,7,8,9,10,11", :en)
+  end
+
+  test "monthly excluding january" do
+    assert_equal "Jeden zweiten Mittwoch im Monat, außer im Januar",
+      humanize("FREQ=MONTHLY;BYMONTH=2,3,4,5,6,7,8,9,10,11,12;BYDAY=2WE")
+  end
+
+  test "blank rrule returns nil" do
+    assert_nil humanize(nil)
+    assert_nil humanize("")
+  end
+
+  test "count and until are not guessed at" do
+    assert_nil humanize("FREQ=MONTHLY;BYDAY=1WE;COUNT=36")
+    assert_nil humanize("FREQ=MONTHLY;BYDAY=1WE;UNTIL=20050105T222222Z")
+  end
+
+  test "unrecognized freq returns nil" do
+    assert_nil humanize("FREQ=YEARLY;BYMONTH=12")
+  end
+
+  test "falls back to english for unknown locale" do
+    assert_equal "Every Tuesday", humanize("FREQ=WEEKLY;BYDAY=TU", :fr)
+  end
+
+  test "wday_abbr returns the correct German abbreviation for each day" do
+    monday = Time.parse("2026-07-06") # confirmed Monday
+    assert_equal "Mo", RruleHumanizer.wday_abbr(monday, :de)
+    assert_equal "Di", RruleHumanizer.wday_abbr(monday + 1.day, :de)
+    assert_equal "Mi", RruleHumanizer.wday_abbr(monday + 2.days, :de)
+    assert_equal "Do", RruleHumanizer.wday_abbr(monday + 3.days, :de)
+    assert_equal "Fr", RruleHumanizer.wday_abbr(monday + 4.days, :de)
+    assert_equal "Sa", RruleHumanizer.wday_abbr(monday + 5.days, :de)
+    assert_equal "So", RruleHumanizer.wday_abbr(monday + 6.days, :de)
+  end
+
+  test "wday_abbr falls back to :de for an unrecognized locale" do
+    assert_equal "Mo", RruleHumanizer.wday_abbr(Time.parse("2026-07-06"), :fr)
+  end
+end
diff --git a/test/models/event_test.rb b/test/models/event_test.rb
index f310af8..e98605e 100644
--- a/test/models/event_test.rb
+++ b/test/models/event_test.rb
@@ -29,7 +29,6 @@ class EventTest < ActiveSupport::TestCase
         :longitude    => 13.378944,
         :rrule        => "FOOBAR",
         :allday       => false,
-        :custom_rrule => false,
         :node_id      => @cal_node.id
       )
     end
@@ -44,7 +43,6 @@ class EventTest < ActiveSupport::TestCase
       :longitude    => 13.378944,
       :rrule        => nil,
       :allday       => false,
-      :custom_rrule => false,
       :node_id      => @cal_node.id
     )
     
@@ -62,7 +60,6 @@ class EventTest < ActiveSupport::TestCase
       :longitude    => 13.378944,
       :rrule        => "FREQ=WEEKLY;INTERVAL=1",
       :allday       => false,
-      :custom_rrule => false,
       :node_id      => @cal_node.id
     )
     
@@ -74,17 +71,17 @@ class EventTest < ActiveSupport::TestCase
     
     assert_equal "2009-12-24T15:23:42".to_time, scoped_occurrences[51].start_time
     assert_equal "2009-12-24T20:05:23".to_time, scoped_occurrences[51].end_time
-    assert_equal @cal_node.event, scoped_occurrences[51].event
+    assert_equal @cal_node.events.first, scoped_occurrences[51].event
     assert_equal @cal_node, scoped_occurrences[51].node
     
     assert_equal "2009-03-19T15:23:42".to_time, scoped_occurrences[11].start_time
     assert_equal "2009-03-19T20:05:23".to_time, scoped_occurrences[11].end_time
-    assert_equal @cal_node.event, scoped_occurrences[11].event
+    assert_equal @cal_node.events.first, scoped_occurrences[11].event
     assert_equal @cal_node, scoped_occurrences[11].node
     
     assert_equal "2009-01-01T15:23:42".to_time, scoped_occurrences[0].start_time
     assert_equal "2009-01-01T20:05:23".to_time, scoped_occurrences[0].end_time
-    assert_equal @cal_node.event, scoped_occurrences[11].event
+    assert_equal @cal_node.events.first, scoped_occurrences[11].event
     assert_equal @cal_node, scoped_occurrences[11].node
   end
   
@@ -97,7 +94,6 @@ class EventTest < ActiveSupport::TestCase
       :longitude    => 13.378944,
       :rrule        => "FREQ=MONTHLY;INTERVAL=1;BYDAY=-1WE",
       :allday       => false,
-      :custom_rrule => true,
       :node_id      => @cal_node.id
     )
     
@@ -111,4 +107,4 @@ class EventTest < ActiveSupport::TestCase
     chaosradio_days = scoped_occurrences.map {|x| x.start_time.day}
     assert_equal expected_days, chaosradio_days
   end
-end
\ No newline at end of file
+end
diff --git a/test/models/helpers/admin_helper_test.rb b/test/models/helpers/admin_helper_test.rb
index 23d9f40..94e9861 100644
--- a/test/models/helpers/admin_helper_test.rb
+++ b/test/models/helpers/admin_helper_test.rb
@@ -1,4 +1,14 @@
 require 'test_helper'
 
 class AdminHelperTest < ActionView::TestCase
+  test "mtime_busted_path appends the file's real mtime as a query param" do
+    path = "/stylesheets/admin.css"
+    expected_mtime = File.mtime(Rails.public_path.join("stylesheets/admin.css")).to_i
+
+    assert_equal "#{path}?v=#{expected_mtime}", mtime_busted_path(path)
+  end
+
+  test "mtime_busted_path raises clearly for a missing file rather than silently omitting the version" do
+    assert_raises(RuntimeError) { mtime_busted_path("/stylesheets/does_not_exist.css") }
+  end
 end
diff --git a/test/models/helpers/content_helper_test.rb b/test/models/helpers/content_helper_test.rb
index 2da82d7..a7ed478 100644
--- a/test/models/helpers/content_helper_test.rb
+++ b/test/models/helpers/content_helper_test.rb
@@ -1,4 +1,8 @@
 require 'test_helper'
 
 class ContentHelperTest < ActionView::TestCase
+  test "weekday_abbr delegates through the current I18n locale" do
+    I18n.locale = :de
+    assert_equal "Mo", weekday_abbr(Time.parse("2026-07-06"))
+  end
 end
diff --git a/test/models/helpers/datetime_helper_test.rb b/test/models/helpers/datetime_helper_test.rb
new file mode 100644
index 0000000..a24e5d3
--- /dev/null
+++ b/test/models/helpers/datetime_helper_test.rb
@@ -0,0 +1,19 @@
+require 'test_helper'
+
+class DatetimeHelperTest < ActionView::TestCase
+  test "relative_time_phrase pluralizes correctly in English and German" do
+    travel_to Time.zone.parse("2026-07-12 12:00:00") do
+      I18n.with_locale(:en) do
+        assert_equal "1 day ago", relative_time_phrase(1.day.ago)
+        assert_equal "3 days ago", relative_time_phrase(3.days.ago)
+      end
+      I18n.with_locale(:de) do
+        assert_equal "vor 1 Tag", relative_time_phrase(1.day.ago)
+        assert_equal "vor 3 Tagen", relative_time_phrase(3.days.ago)
+        assert_equal "vor 1 Monat", relative_time_phrase(30.days.ago)
+        assert_equal "vor 2 Monaten", relative_time_phrase(45.days.ago)
+        assert_equal "vor 2 Jahren", relative_time_phrase(2.years.ago)
+      end
+    end
+  end
+end
diff --git a/test/models/helpers/events_helper_test.rb b/test/models/helpers/events_helper_test.rb
index 2e7567e..0486b3e 100644
--- a/test/models/helpers/events_helper_test.rb
+++ b/test/models/helpers/events_helper_test.rb
@@ -1,4 +1,25 @@
 require 'test_helper'
 
 class EventsHelperTest < ActionView::TestCase
+  test "rrule_with_break_opportunities inserts a break opportunity after each semicolon" do
+    result = rrule_with_break_opportunities("FREQ=MONTHLY;BYMONTH=1,2,3;BYDAY=-1TH")
+    assert_equal "FREQ=MONTHLY;<wbr>BYMONTH=1,2,3;<wbr>BYDAY=-1TH", result
+    assert result.html_safe?
+  end
+
+  test "rrule_with_break_opportunities escapes HTML-significant characters" do
+    result = rrule_with_break_opportunities("FREQ=WEEKLY;BYDAY=<script>")
+    assert_no_match /<script>/, result
+    assert_match "&lt;script&gt;", result
+  end
+
+  test "rrule_with_break_opportunities returns an empty string for blank input" do
+    assert_equal "", rrule_with_break_opportunities(nil)
+    assert_equal "", rrule_with_break_opportunities("")
+  end
+
+  test "rrule_with_break_opportunities preserves a trailing semicolon" do
+    result = rrule_with_break_opportunities("FREQ=WEEKLY;")
+    assert_equal "FREQ=WEEKLY;<wbr>", result
+  end
 end
diff --git a/test/models/helpers/nodes_helper_test.rb b/test/models/helpers/nodes_helper_test.rb
index 13011de..5ab924f 100644
--- a/test/models/helpers/nodes_helper_test.rb
+++ b/test/models/helpers/nodes_helper_test.rb
@@ -1,4 +1,36 @@
 require 'test_helper'
 
 class NodesHelperTest < ActionView::TestCase
+  FakePage = Struct.new(:tag_list)
+
+  test "default_event_tag_mapping matches erfa-detail" do
+    page = FakePage.new(["erfa-detail"])
+    assert_equal ["erfa-detail", "open-day"], default_event_tag_mapping(page)
+  end
+
+  test "default_event_tag_mapping matches chaostreff-detail" do
+    page = FakePage.new(["chaostreff-detail"])
+    assert_equal ["chaostreff-detail", "open-day"], default_event_tag_mapping(page)
+  end
+
+  test "default_event_tag_mapping returns nil for unrelated tags" do
+    page = FakePage.new(["update"])
+    assert_nil default_event_tag_mapping(page)
+  end
+
+  test "default_event_tag_list is nil without a matching tag" do
+    page = FakePage.new([])
+    assert_nil default_event_tag_list(page)
+  end
+
+  test "sitemap_node_open? is false for a configured collapsed path" do
+    club = Node.root.children.create!(:slug => "club")
+    erfas = club.children.create!(:slug => "erfas")
+    assert_equal false, sitemap_node_open?(erfas)
+  end
+
+  test "sitemap_node_open? is true for anything not configured as collapsed" do
+    node = Node.root.children.create!(:slug => "sitemap_open_test")
+    assert_equal true, sitemap_node_open?(node)
+  end
 end
diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index 514ba3f..91a4a6d 100644
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -98,6 +98,7 @@ class NodeTest < ActiveSupport::TestCase
     assert_not_nil node.draft
     assert_nil node.draft.user
     assert_nil node.head
+    assert_nil node.autosave
   end
   
   def test_create_new_draft_of_published_page
@@ -110,15 +111,19 @@ class NodeTest < ActiveSupport::TestCase
     node.publish_draft!
     assert_not_nil node.find_or_create_draft( @user1 )
   end
-  
+
   def test_find_or_create_draft_if_draft_exists_and_is_owned_by_user
     node = Node.root.children.create :slug => "xyz"
     node.publish_draft!
-    
-    node.find_or_create_draft @user1
-    node.find_or_create_draft @user1
+
+    first_call  = node.find_or_create_draft @user1
+    second_call = node.find_or_create_draft @user1
+
+    assert_equal first_call, second_call
+    assert_equal 2, node.pages.count
+    assert_equal @user1, node.lock_owner
   end
-  
+
   def test_exception_if_draft_exists_but_locked_by_another_user
     node = Node.root.children.create :slug => "xyz"
     node.publish_draft!
@@ -280,6 +285,191 @@ class NodeTest < ActiveSupport::TestCase
     node = Node.root.children.create( :slug => "wow" )
     assert_nil node.draft.published_at
   end
+
+  test "lock_for_editing! acquires the lock without creating a draft or autosave" do
+    node = create_node_with_published_page
+
+    node.lock_for_editing!(@user1)
+
+    assert_equal @user1, node.lock_owner
+    assert_nil node.draft
+    assert_nil node.autosave
+  end
+
+  test "autosave! creates a buffer that never appears among a node's pages, leaving the draft untouched" do
+    node = create_node_with_draft
+    node.lock_for_editing!(@user1)
+    page_count_before = node.pages.count
+
+    node.autosave!({ :title => "in progress" }, @user1)
+    node.reload
+
+    assert_not_nil node.autosave
+    assert_nil node.autosave.node_id
+    assert_equal page_count_before, node.pages.count
+    assert_not_equal "in progress", node.draft.title
+  end
+
+  test "save_draft! promotes an autosave into an existing draft without creating a new revision" do
+    node = create_node_with_draft
+    node.lock_for_editing!(@user1)
+    node.autosave!({ :title => "in progress" }, @user1)
+    page_count_before = node.pages.count
+
+    node.save_draft!(@user1)
+    node.reload
+
+    assert_nil node.autosave
+    assert_equal "in progress", node.draft.title
+    assert_equal page_count_before, node.pages.count
+  end
+
+  test "save_draft! promotes an autosave into a brand new, correctly-revisioned draft when none exists" do
+    node = create_node_with_published_page
+    head_revision = node.head.revision
+
+    node.lock_for_editing!(@user1)
+    node.autosave!({ :title => "updated version" }, @user1)
+    node.reload
+
+    assert_nil node.draft
+    assert_nil node.autosave.node_id
+
+    node.save_draft!(@user1)
+    node.reload
+
+    assert_not_nil node.draft
+    assert_equal head_revision + 1, node.draft.revision
+    assert_equal head_revision, node.head.revision
+    assert_nil node.autosave
+    assert_equal 2, node.pages.count
+    assert_equal node.head.user, node.draft.user
+    assert_equal @user1, node.draft.editor
+    assert_equal node.head.published_at, node.draft.published_at
+  end
+
+  test "autosave!, save_draft!, and lock_for_editing! raise LockedByAnotherUser for a second user" do
+    node = create_node_with_published_page
+    node.lock_for_editing!(@user1)
+
+    assert_raise(LockedByAnotherUser) { node.autosave!({ :title => "x" }, @user2) }
+    assert_raise(LockedByAnotherUser) { node.save_draft!(@user2) }
+    assert_raise(LockedByAnotherUser) { node.lock_for_editing!(@user2) }
+
+    assert_equal @user1, node.reload.lock_owner
+  end
+
+  test "wipe_draft! leaves a fresh autosave and its lock untouched" do
+    node = create_node_with_published_page
+    node.lock_for_editing!(@user1)
+    node.autosave!({ :title => "still typing" }, @user1)
+
+    node.wipe_draft!
+    node.reload
+
+    assert_not_nil node.autosave
+    assert_equal @user1, node.lock_owner
+  end
+
+  test "wipe_draft! destroys a stale, orphaned autosave and releases its lock" do
+    node = create_node_with_published_page
+    node.lock_for_editing!(@user1)
+    node.autosave!({ :title => "abandoned mid-session" }, @user1)
+    node.autosave.update_column(:updated_at, 2.days.ago)
+
+    node.wipe_draft!
+    node.reload
+
+    assert_nil node.autosave
+    assert_nil node.lock_owner
+  end
+
+  test "revert! is a safe no-op on a fresh node with only a draft" do
+    node = create_node_with_draft
+    node.lock_for_editing!(@user1)
+
+    node.revert!(@user1)
+    node.reload
+
+    assert_not_nil node.draft
+    assert_equal @user1, node.lock_owner
+  end
+
+  test "revert! discards an autosave on a fresh node without touching its only draft" do
+    node = create_node_with_draft
+    node.lock_for_editing!(@user1)
+    node.autosave!({ :title => "typing" }, @user1)
+
+    node.revert!(@user1)
+    node.reload
+
+    assert_nil node.autosave
+    assert_not_nil node.draft
+    assert_equal @user1, node.lock_owner
+  end
+
+  test "revert! does nothing when a published node has no draft or autosave" do
+    node = create_node_with_published_page
+    node.lock_for_editing!(@user1)
+
+    node.revert!(@user1)
+    node.reload
+
+    assert_not_nil node.head
+    assert_nil node.draft
+  end
+
+  test "revert! discards a fresh autosave and releases the lock when no draft exists" do
+    node = create_node_with_published_page
+    node.lock_for_editing!(@user1)
+    node.autosave!({ :title => "in progress" }, @user1)
+
+    node.revert!(@user1)
+    node.reload
+
+    assert_nil node.autosave
+    assert_nil node.draft
+    assert_nil node.lock_owner
+  end
+
+  test "revert! destroys an existing draft and releases the lock" do
+    node = create_node_with_published_page
+    head_title = node.head.title
+    node.lock_for_editing!(@user1)
+    node.autosave!({ :title => "second version" }, @user1)
+    node.save_draft!(@user1)
+
+    node.revert!(@user1)
+    node.reload
+
+    assert_nil node.draft
+    assert_equal head_title, node.head.title
+    assert_nil node.lock_owner
+  end
+
+  test "revert! discards only the autosave when a draft survives beneath it" do
+    node = create_node_with_published_page
+    node.lock_for_editing!(@user1)
+    node.autosave!({ :title => "second version" }, @user1)
+    node.save_draft!(@user1)
+    node.autosave!({ :title => "third version, still typing" }, @user1)
+
+    node.revert!(@user1)
+    node.reload
+
+    assert_nil node.autosave
+    assert_not_nil node.draft
+    assert_equal "second version", node.draft.title
+    assert_equal @user1, node.lock_owner
+  end
+
+  test "revert! raises LockedByAnotherUser for a non-owner" do
+    node = create_node_with_published_page
+    node.lock_for_editing!(@user1)
+
+    assert_raise(LockedByAnotherUser) { node.revert!(@user2) }
+    assert_equal @user1, node.reload.lock_owner
+  end
   
   def create_revisions node, count
     count.times do
@@ -287,4 +477,173 @@ class NodeTest < ActiveSupport::TestCase
       node.publish_draft!
     end
   end
+
+  test "available_layer_pairs matches the six-state table" do
+    node = Node.root.children.create!(:slug => "layer_pairs_test")
+    user = @user1 || User.find_by_login("aaron")
+
+    assert_equal [[:draft, :autosave]], (node.lock_for_editing!(user); node.autosave!({title: "v1"}, user); node.available_layer_pairs) # state F
+
+    node.save_draft!(user)
+    node.publish_draft!
+    assert_equal [], node.available_layer_pairs # state A
+
+    node.lock_for_editing!(user)
+    node.autosave!({title: "v2"}, user)
+    assert_equal [[:head, :autosave]], node.available_layer_pairs # state B
+
+    node.save_draft!(user)
+    assert_equal [[:head, :draft]], node.available_layer_pairs # state C
+
+    node.lock_for_editing!(user)
+    node.autosave!({title: "v3"}, user)
+    assert_equal [[:head, :draft], [:draft, :autosave]], node.available_layer_pairs # state D
+  end
+
+  test "publishing a staged move under one's own descendant is rejected, not allowed to crash" do
+    a = Node.root.children.create!(:slug => "cycle_guard_a")
+    b = a.children.create!(:slug => "cycle_guard_b")
+
+    a.staged_parent_id = b.id
+
+    assert_raises(ActiveRecord::RecordInvalid) { a.publish_draft! }
+
+    a.reload
+    assert_equal Node.root.id, a.parent_id
+  end
+
+  test "editor_search matches a partial substring, not just a whole word" do
+    node = Node.root.children.create!(:slug => "editor_search_substring_test")
+    node.find_or_create_draft(@user1)
+    node.draft.update(:title => "Biometrics Conference")
+    node.publish_draft!
+
+    assert_includes Node.editor_search("bio"), node
+    assert_includes Node.editor_search("Conf"), node
+  end
+
+  test "editor_search returns an empty relation for a blank term, not every node" do
+    assert_equal 0, Node.editor_search("").count
+    assert_equal 0, Node.editor_search(nil).count
+    assert_equal 0, Node.editor_search("   ").count
+  end
+
+  test "editor_search requires every word to match, but each word can match a different field" do
+    node = Node.root.children.create!(:slug => "editor_search_multiword_test")
+    node.find_or_create_draft(@user1)
+    node.draft.update(:title => "Backspace e.V. Bamberg", :abstract => "Spiegelgraben 41, 96052 Bamberg")
+    node.publish_draft!
+
+    assert_includes Node.editor_search("Backspace Spiegelgraben"), node
+    assert_equal 0, Node.editor_search("Backspace Nonexistentstreet").count
+  end
+
+  test "drafts_and_autosaves without a user sorts by recency only" do
+    older = Node.root.children.create!(:slug => "drafts_order_older")
+    older.find_or_create_draft(@user1)
+    newer = Node.root.children.create!(:slug => "drafts_order_newer")
+    newer.find_or_create_draft(@user1)
+
+    result = Node.drafts_and_autosaves.to_a
+    assert result.index(newer) < result.index(older)
+  end
+
+  test "drafts_and_autosaves with a user puts their own locked nodes first, regardless of recency" do
+    mine = Node.root.children.create!(:slug => "drafts_order_mine")
+    mine.lock_for_editing!(@user1)
+    mine.autosave!({:title => "mine"}, @user1)
+
+    someone_elses_newer = Node.root.children.create!(:slug => "drafts_order_theirs")
+    other_user = User.find_by_login("quentin")
+    someone_elses_newer.lock_for_editing!(other_user)
+    someone_elses_newer.autosave!({:title => "theirs"}, other_user)
+
+    result = Node.drafts_and_autosaves(current_user_id: @user1.id).to_a
+    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")
+    node.find_or_create_draft(@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")
+    node.find_or_create_draft(@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")
+    asset = Asset.create!(:name => "carryover-photo", :upload_content_type => "image/png")
+    node.draft.assets << asset
+
+    node.lock_for_editing!(user)
+    node.autosave!({:title => "v1"}, user)
+
+    assert_includes node.autosave.reload.assets, asset
+  end
+
+  test "autosave! does not reset assets already attached directly to an existing autosave" do
+    node = Node.root.children.create!(:slug => "autosave_asset_no_reset_test")
+    user = User.find_by_login("quentin")
+    original = Asset.create!(:name => "original-photo", :upload_content_type => "image/png")
+    extra = Asset.create!(:name => "extra-photo", :upload_content_type => "image/png")
+    node.draft.assets << original
+
+    node.lock_for_editing!(user)
+    node.autosave!({:title => "v1"}, user)
+    node.autosave.assets << extra
+
+    node.autosave!({:title => "v2"}, user)
+
+    assert_includes node.autosave.reload.assets, original
+    assert_includes node.autosave.reload.assets, extra
+  end
+
+  test "autosave! carries over other-locale translations to the newly created autosave row" do
+    node = Node.root.children.create!(:slug => "autosave_translation_carryover_test")
+    user = User.find_by_login("quentin")
+
+    Globalize.with_locale(:en) { node.draft.update!(:title => "English title") }
+
+    node.lock_for_editing!(user)
+    Globalize.with_locale(:de) { node.autosave!({:title => "German edit"}, user) }
+
+    autosave = node.autosave.reload
+    assert_includes autosave.translated_locales, :en
+    assert_equal "English title", Globalize.with_locale(:en) { autosave.title }
+    assert_equal "German edit",   Globalize.with_locale(:de) { autosave.title }
+  end
+
+  test "autosave! does not reset other-locale translations already attached directly to an existing autosave" do
+    node = Node.root.children.create!(:slug => "autosave_translation_no_reset_test")
+    user = User.find_by_login("quentin")
+
+    Globalize.with_locale(:en) { node.draft.update!(:title => "Original English title") }
+
+    node.lock_for_editing!(user)
+    Globalize.with_locale(:de) { node.autosave!({:title => "v1"}, user) }
+    Globalize.with_locale(:en) { node.autosave.update!(:title => "Edited directly on autosave") }
+
+    Globalize.with_locale(:de) { node.autosave!({:title => "v2"}, user) }
+
+    autosave = node.autosave.reload
+    assert_equal "Edited directly on autosave", Globalize.with_locale(:en) { autosave.title }
+    assert_equal "v2",                          Globalize.with_locale(:de) { autosave.title }
+  end
 end
diff --git a/test/models/page_test.rb b/test/models/page_test.rb
index afba8b5..24bc7c5 100644
--- a/test/models/page_test.rb
+++ b/test/models/page_test.rb
@@ -142,5 +142,232 @@ class PageTest < ActiveSupport::TestCase
     update        = updates2009.children.create!( :slug => "my-first-update" )
     assert_equal "update", update.draft.template_name
   end
-  
+
+  test "a page scheduled for future publication is not yet public even after being published" do
+    node = Node.root.children.create!(slug: "preview-scheduled-test")
+    draft = node.find_or_create_draft(@user1)
+    draft.title = "Scheduled test"
+    draft.published_at = 1.day.from_now
+    draft.save!
+    token = draft.ensure_preview_token!
+
+    node.publish_draft!
+    page = Page.find_by(preview_token: token)
+
+    assert_equal page.id, page.node.head_id
+    assert_not page.public?
+  end
+
+  test "a superseded page is no longer the head, even though it was once published" do
+    node = Node.root.children.create!(slug: "preview-superseded-test")
+    first_draft = node.find_or_create_draft(@user1)
+    first_draft.title = "First version"
+    first_draft.save!
+    first_token = first_draft.ensure_preview_token!
+    node.publish_draft!
+
+    second_draft = node.find_or_create_draft(@user1)
+    second_draft.title = "Second version"
+    second_draft.save!
+    node.publish_draft!
+
+    first_page = Page.find_by(preview_token: first_token)
+
+    assert_not_equal first_page.id, first_page.node.head_id
+    assert first_page.published_at.present?
+  end
+
+  test "clone_attributes_from preserves an unchanged locale's original timestamp" do
+    n = Node.root.children.create!(:slug => "clone_preserve_timestamp_test")
+    source = n.draft
+    Globalize.with_locale(:de) { source.update!(:title => "Deutscher Titel") }
+    Globalize.with_locale(:en) { source.update!(:title => "English Title") }
+
+    target = Page.create!
+    target.clone_attributes_from(source)
+    original_en_updated_at = target.translations.find_by(:locale => :en).updated_at
+
+    Globalize.with_locale(:de) { source.update!(:title => "Deutscher Titel (bearbeitet)") }
+    target.clone_attributes_from(source)
+
+    en_translation = target.translations.find_by(:locale => :en)
+    assert_equal "English Title", en_translation.title
+    assert_equal original_en_updated_at, en_translation.updated_at
+  end
+
+  test "clone_attributes_from gives a genuinely changed locale a fresh timestamp" do
+    n = Node.root.children.create!(:slug => "clone_fresh_timestamp_test")
+    source = n.draft
+    Globalize.with_locale(:de) { source.update!(:title => "Erste Version") }
+
+    target = Page.create!
+    target.clone_attributes_from(source)
+    original_de_updated_at = target.translations.find_by(:locale => :de).updated_at
+
+    Globalize.with_locale(:de) { source.update!(:title => "Zweite Version") }
+    target.clone_attributes_from(source)
+
+    de_translation = target.translations.find_by(:locale => :de)
+    assert_equal "Zweite Version", de_translation.title
+    assert_operator de_translation.updated_at, :>, original_de_updated_at
+  end
+
+  test "clone_attributes_from removes a locale no longer present in the source" do
+    n = Node.root.children.create!(:slug => "clone_removed_locale_test")
+    source = n.draft
+    Globalize.with_locale(:en) { source.update!(:title => "English Title") }
+
+    target = Page.create!
+    target.clone_attributes_from(source)
+    assert_includes target.translations.map(&:locale), :en
+
+    source.translations.where(:locale => :en).delete_all
+    target.clone_attributes_from(source)
+
+    assert_not_includes target.reload.translations.map(&:locale), :en
+  end
+
+  def test_diff_against_inline_keeps_tags_and_marks_only_the_changed_word
+    n = Node.root.children.create! :slug => "diff_against_test"
+    d = n.find_or_create_draft @user1
+    d.title = "Old heading"
+    d.save!
+    n.publish_draft!
+
+    d2 = n.find_or_create_draft @user1
+    d2.title = "New heading"
+    d2.save!
+
+    diff = d2.diff_against(n.head)
+
+    assert_match "<del>Old</del>", diff[:title]
+    assert_match "<ins>New</ins>", diff[:title]
+  end
+
+  def test_diff_against_side_by_side_returns_two_annotated_strings
+    n = Node.root.children.create! :slug => "diff_against_sbs_test"
+    d = n.find_or_create_draft @user1
+    d.title = "Old heading"
+    d.save!
+    n.publish_draft!
+
+    d2 = n.find_or_create_draft @user1
+    d2.title = "New heading"
+    d2.save!
+
+    old_html, new_html = d2.diff_against(n.head, view: :side_by_side)[:title]
+
+    assert_match "<del>Old</del>", old_html
+    assert_match "<ins>New</ins>", new_html
+  end
+
+  test "diff_against handles an inserted paragraph split without corrupting the document" do
+    n = Node.root.children.create! :slug => "paragraph_split_test"
+    d = n.find_or_create_draft @user1
+    d.body = "<p>Der Vortragsraum ist ab 19 Uhr geöffnet, der Zugang erfolgt über den Hinterhof.</p>"
+    d.save!
+    n.publish_draft!
+
+    d2 = n.find_or_create_draft @user1
+    d2.body = "<p>Der Vortragsraum ist ab 19 Uhr geöffnet,</p>\n<p>der Zugang erfolgt über den Hinterhof.</p>"
+    d2.save!
+
+    diff = d2.diff_against(n.head)
+    fragment = Nokogiri::HTML::DocumentFragment.parse(diff[:body])
+
+    assert_equal 2, fragment.css('ins.diff_structural').length
+    assert_match "der Zugang erfolgt über den Hinterhof.", fragment.text
+  end
+
+  test "diff_against reports tag and template changes" do
+    n = Node.root.children.create! :slug => "field_diff_test"
+    d = n.find_or_create_draft @user1
+    d.tag_list = "update"
+    d.template_name = "standard_template"
+    d.save!
+    n.publish_draft!
+
+    d2 = n.find_or_create_draft @user1
+    d2.tag_list = "update, pressemitteilung"
+    d2.template_name = "title_only"
+    d2.save!
+
+    diff = d2.diff_against(n.head)
+
+    assert_equal ["pressemitteilung"], diff[:tags][:added]
+    assert_equal [], diff[:tags][:removed]
+    assert diff[:template_name][:changed]
+    assert_equal "standard_template", diff[:template_name][:from]
+    assert_equal "title_only", diff[:template_name][:to]
+  end
+
+  test "diff_against reports added and removed assets by filename" do
+    n = Node.root.children.create! :slug => "asset_diff_test"
+    d = n.find_or_create_draft @user1
+    d.save!
+    n.publish_draft!
+
+    kept_asset    = Asset.create!(:upload_file_name => "kept.png", :upload_content_type => "image/png", :upload_file_size => 1)
+    removed_asset = Asset.create!(:upload_file_name => "removed.pdf", :upload_content_type => "application/pdf", :upload_file_size => 1)
+    n.head.update_assets([kept_asset.id, removed_asset.id])
+
+    d2 = n.find_or_create_draft @user1
+    added_asset = Asset.create!(:upload_file_name => "added.png", :upload_content_type => "image/png", :upload_file_size => 1)
+    d2.update_assets([kept_asset.id, added_asset.id])
+    d2.save!
+
+    diff = d2.diff_against(n.head)
+
+    assert_equal [added_asset], diff[:assets][:added]
+    assert_equal [removed_asset], diff[:assets][:removed]
+  end
+
+  test "diff_against with an explicit locale compares that locale's own translation on each side" do
+    n = Node.root.children.create!(:slug => "diff_locale_test")
+    d = n.find_or_create_draft(@user1)
+    Globalize.with_locale(:en) { d.update!(:title => "Old English") }
+    d.save!
+    n.publish_draft!
+
+    d2 = n.find_or_create_draft(@user1)
+    Globalize.with_locale(:en) { d2.update!(:title => "New English") }
+    d2.save!
+
+    diff = d2.diff_against(n.head, :locale => :en)
+
+    assert_match "<del>Old</del>", diff[:title]
+    assert_match "<ins>New</ins>", diff[:title]
+  end
+
+  test "diff_against with an explicit locale ignores content in other locales entirely" do
+    n = Node.root.children.create!(:slug => "diff_locale_isolation_test")
+    d = n.find_or_create_draft(@user1)
+    d.save!
+    n.publish_draft!
+
+    d2 = n.find_or_create_draft(@user1)
+    Globalize.with_locale(:de) { d2.update!(:title => "Nur Deutsch geändert") }
+    d2.save!
+
+    diff = d2.diff_against(n.head, :locale => :en)
+
+    assert_no_match(/Deutsch/, diff[:title])
+  end
+
+  test "locale_diff_summary flags a locale that only exists on one side as changed" do
+    n = Node.root.children.create!(:slug => "diff_locale_summary_test")
+    d = n.find_or_create_draft(@user1)
+    d.save!
+    n.publish_draft!
+
+    d2 = n.find_or_create_draft(@user1)
+    Globalize.with_locale(:en) { d2.update!(:title => "New English translation") }
+    d2.save!
+
+    summary = d2.locale_diff_summary(n.head)
+    en_entry = summary.find { |s| s[:locale] == :en }
+
+    assert en_entry[:changed]
+    refute en_entry[:exists_there]
+  end
 end