2 files changed, 43 insertions, 5 deletions

diff --git a/test/models/helpers/node_actions_helper_test.rb b/test/models/helpers/node_actions_helper_test.rb
index 93bbdf6..5244c19 100644
--- a/test/models/helpers/node_actions_helper_test.rb
+++ b/test/models/helpers/node_actions_helper_test.rb
@@ -21,12 +21,13 @@ class NodeActionsHelperTest < ActionView::TestCase
                                        "human_readable_node_name" => "Subject" }.merge(metadata))
   end
 
-  test "publish renders the title pair" do
+  test "publish renders the revision sentence, not the titles" do
     out = action_summary(entry("publish",
       { "via" => "draft", "title" => { "from" => "Old", "to" => "New" } }))
 
     assert_includes out, "quentin"
-    assert_includes out, "Old"
+    assert_includes out, "new revision"
+    assert_not_includes out, "Old"
   end
 
   test "first publish uses its own sentence" do
@@ -68,10 +69,8 @@ class NodeActionsHelperTest < ActionView::TestCase
 
   test "metadata values are escaped" do
     out = action_summary(entry("publish",
-      { "human_readable_node_name" => "<b>bold</b>",
-        "title" => { "from" => "<script>alert(1)</script>", "to" => "x" } }))
+      { "human_readable_node_name" => "<b>bold</b>" }))
 
-    assert_not_includes out, "<script>"
     assert_not_includes out, "<b>"
   end
 
@@ -82,4 +81,27 @@ class NodeActionsHelperTest < ActionView::TestCase
 
     assert_includes out, "<a "
   end
+
+  test "details are guarded off when nothing but an unchanged title is present" do
+    unchanged = entry("publish", { "title" => { "from" => "Same", "to" => "Same" } })
+    changed   = entry("publish", { "title" => { "from" => "Old",  "to" => "New" } })
+
+    assert_not action_details?(unchanged)
+    assert action_details?(changed)
+  end
+
+  test "first publish with a byline names the author" do
+    out = action_summary(entry("publish",
+      { "title" => { "from" => nil, "to" => "New" },
+        "author" => { "from" => nil, "to" => "quentin" } }))
+
+    assert_includes out, "author"
+  end
+
+  test "create entries with their flat title render and are guarded off details" do
+    e = entry("create", { "title" => "Initial", "path" => "a/b" })
+
+    assert_includes action_summary(e), "a/b"
+    assert_not action_details?(e)
+  end
 end
diff --git a/test/models/node_action_test.rb b/test/models/node_action_test.rb
index 24d8245..b177cca 100644
--- a/test/models/node_action_test.rb
+++ b/test/models/node_action_test.rb
@@ -18,6 +18,12 @@ class NodeActionTest < ActiveSupport::TestCase
     assert_equal({ :title => { "from" => nil, "to" => "Erstausgabe" } }, diff)
   end
 
+  test "first publish carries the byline when the page has one" do
+    diff = NodeAction.head_diff(nil, build_page(:user => users(:quentin)))
+
+    assert_equal({ "from" => nil, "to" => users(:quentin).login }, diff[:author])
+  end
+
   test "title pair is always present, even when unchanged" do
     diff = NodeAction.head_diff(build_page, build_page)
 
@@ -109,4 +115,14 @@ class NodeActionTest < ActiveSupport::TestCase
 
     assert_nil NodeAction.head_diff(old_page, new_page)[:translation_diff]
   end
+
+  test "record! passes provenance and historical timestamps through" do
+    long_ago = 2.years.ago
+    action = NodeAction.record!(:node => nil, :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
 end