+ <%= render "coplan/plans/changed_sections_note" %>
<%# Each presentation region owns its own reader controls and
presenter. Live updates wait until an active show ends before
replacing the content target below. %>
diff --git a/spec/requests/changed_sections_highlight_spec.rb b/spec/requests/changed_sections_highlight_spec.rb
index 5beaf468..41668fb8 100644
--- a/spec/requests/changed_sections_highlight_spec.rb
+++ b/spec/requests/changed_sections_highlight_spec.rb
@@ -42,6 +42,48 @@ def rewritten_attr(body)
expect(keys_attr(response.body)).to eq("[]")
end
+ it "compares against the most recent version the viewer read, without repeating older changes" do
+ original = "## Design\n\nOriginal design.\n\n## Rollout\n\nOriginal rollout.\n"
+ plan.current_plan_version.update_columns(content_markdown: original, created_at: 1.hour.ago)
+ read_version = create(:plan_version, plan: plan, revision: 2, actor_id: author.id,
+ content_markdown: original.sub("Original design", "Revised design"), created_at: 30.minutes.ago)
+ latest = create(:plan_version, plan: plan, revision: 3, actor_id: author.id,
+ content_markdown: read_version.content_markdown.sub("Original rollout", "Revised rollout"), created_at: 5.minutes.ago)
+ plan.update!(current_plan_version: latest, current_revision: 3)
+ CoPlan::PlanViewer.create!(plan: plan, user: viewer, last_seen_at: 10.minutes.ago)
+
+ sign_in_as(viewer)
+ get plan_page_path(plan)
+
+ html = Nokogiri::HTML(response.body)
+ expect(JSON.parse(html.at_css(".plan-layout")["data-coplan--changed-sections-keys-value"])).to eq([ "rollout" ])
+ updates = JSON.parse(html.at_css(".plan-layout")["data-coplan--changed-sections-updates-value"])
+ expect(updates.keys).to eq([ "rollout" ])
+ expect(updates["rollout"]["revision"]).to eq(3)
+ end
+
+ it "embeds the last section editor and time safely, with simple history and dismiss controls" do
+ author.update!(name: 'Editor "
"')
+ original = "## Design\n\nOriginal design.\n\n## Rollout\n\nOriginal rollout.\n"
+ plan.current_plan_version.update_columns(content_markdown: original, created_at: 2.hours.ago)
+ CoPlan::PlanViewer.create!(plan: plan, user: viewer, last_seen_at: 1.hour.ago)
+ edited = create(:plan_version, plan: plan, revision: 2, actor_id: author.id,
+ actor_type: "local_agent", agent_name: "Codex", created_at: 30.minutes.ago,
+ content_markdown: original.sub("Original design", "Revised design"))
+ latest = create(:plan_version, plan: plan, revision: 3, actor_id: viewer.id,
+ content_markdown: edited.content_markdown.sub("Original rollout", "Revised rollout"))
+ plan.update!(current_plan_version: latest, current_revision: 3)
+
+ sign_in_as(viewer)
+ get plan_page_path(plan)
+ html = Nokogiri::HTML(response.body)
+ updates = JSON.parse(html.at_css(".plan-layout")["data-coplan--changed-sections-updates-value"])
+ expect(updates["design"]).to include("by" => 'Codex (via Editor "")', "at" => edited.created_at.iso8601)
+ expect(updates["rollout"]).to include("by" => viewer.name, "at" => latest.created_at.iso8601)
+ expect(html.at_css(".changed-sections-note").text).to include("History", "Dismiss")
+ expect(html.at_css(".changed-sections-note").text).not_to include("Review updates", "Next", "Previous")
+ end
+
it "sends no keys when nothing changed since the last visit" do
sign_in_as(viewer)
get plan_page_path(plan)
diff --git a/spec/services/broadcaster_spec.rb b/spec/services/broadcaster_spec.rb
index 2d89fbbd..062e51fc 100644
--- a/spec/services/broadcaster_spec.rb
+++ b/spec/services/broadcaster_spec.rb
@@ -36,6 +36,57 @@
expect(payloads.first).to include("Hello world")
end
+ it "includes section attribution with a live content update" do
+ payloads = []
+ allow(Turbo::StreamsChannel).to receive(:broadcast_stream_to) do |_streamable, content:|
+ payloads << content.to_s
+ end
+ changes = CoPlan::Plans::ChangedSections::Result.new(keys: [ "plan-content" ], rewritten: false)
+
+ described_class.replace_plan_content(plan, changed_sections: changes)
+
+ stream = Nokogiri::HTML.fragment(payloads.first).at_css("turbo-stream")
+ update = JSON.parse(stream["data-section-update"])
+ expect(update).to include("by" => author.name, "at" => plan.current_plan_version.created_at.iso8601,
+ "revision" => plan.current_revision)
+ end
+
+ it "refreshes attribution for writes without a diff flash, without crediting untouched sections" do
+ original = "## Design\n\nKeep the design.\n\n## Rollout\n\nOriginal rollout.\n"
+ plan.current_plan_version.update_columns(content_markdown: original)
+ version = create(:plan_version, plan: plan, revision: 2, actor_id: author.id,
+ content_markdown: original.sub("Original rollout", "New rollout"))
+ plan.update!(current_plan_version: version, current_revision: 2)
+ payloads = []
+ allow(Turbo::StreamsChannel).to receive(:broadcast_stream_to) do |_streamable, content:|
+ payloads << content.to_s
+ end
+
+ described_class.replace_plan_content(plan)
+
+ stream = Nokogiri::HTML.fragment(payloads.first).at_css("turbo-stream")
+ update = JSON.parse(stream["data-section-update"])
+ expect(update["keys"]).to eq([ "rollout" ])
+ expect(stream["data-changed-sections"]).to be_nil
+ end
+
+ it "preserves extensive rewrite metadata even without a diff flash" do
+ original = %w[Design Data Rollout Testing].map { |title| "## #{title}\n\nOriginal #{title} body.\n" }.join("\n")
+ plan.current_plan_version.update_columns(content_markdown: original)
+ version = create(:plan_version, plan: plan, revision: 2, actor_id: author.id,
+ content_markdown: original.gsub("Original", "Entirely new"))
+ plan.update!(current_plan_version: version, current_revision: 2)
+ payloads = []
+ allow(Turbo::StreamsChannel).to receive(:broadcast_stream_to) do |_streamable, content:|
+ payloads << content.to_s
+ end
+
+ described_class.replace_plan_content(plan)
+
+ update = JSON.parse(Nokogiri::HTML.fragment(payloads.first).at_css("turbo-stream")["data-section-update"])
+ expect(update).to include("keys" => [], "rewritten" => true, "revision" => 2)
+ end
+
it "batches structured source refreshes without replacing prose threads or leaking session tokens" do
threads = 3.times.map do
thread = create(:comment_thread, plan: plan, anchor_text: "Some content")
diff --git a/spec/services/plans/section_updates_spec.rb b/spec/services/plans/section_updates_spec.rb
new file mode 100644
index 00000000..66065288
--- /dev/null
+++ b/spec/services/plans/section_updates_spec.rb
@@ -0,0 +1,49 @@
+require "rails_helper"
+
+RSpec.describe CoPlan::Plans::SectionUpdates do
+ let(:author) { create(:coplan_user) }
+ let(:other_author) { create(:coplan_user) }
+ let(:plan) { create(:plan, created_by_user: author) }
+ let(:original) { "## Design\n\nOriginal design.\n\n## Rollout\n\nOriginal rollout.\n" }
+
+ def add_version(revision, content, user = author)
+ version = create(:plan_version, plan: plan, revision: revision, actor_id: user.id, content_markdown: content)
+ plan.update!(current_plan_version: version, current_revision: revision)
+ version
+ end
+
+ before { plan.current_plan_version.update_columns(content_markdown: original) }
+
+ it "attributes each section to its last actual edit, even after later unrelated edits" do
+ design_content = original.sub("Original design", "Revised design")
+ design = add_version(2, design_content)
+ rollout = add_version(3, design_content.sub("Original rollout", "Revised rollout"), other_author)
+ add_version(4, rollout.content_markdown)
+
+ updates = described_class.call(plan: plan, keys: %w[design rollout], since_revision: 1)
+ expect(updates).to eq("design" => design, "rollout" => rollout)
+ expect(updates["design"].actor_user).to eq(author)
+ expect(updates["rollout"].actor_user).to eq(other_author)
+ end
+
+ it "attributes added and renamed sections and an edited introduction" do
+ content = "New introduction.\n\n#{original.sub('## Design', '## Approach')}\n## Testing\n\nNew tests.\n"
+ version = add_version(2, content)
+
+ expect(described_class.call(plan: plan, keys: %w[__top__ approach testing], since_revision: 1))
+ .to eq("__top__" => version, "approach" => version, "testing" => version)
+ end
+
+ it "walks across batches to find an older section edit" do
+ content = original.sub("Original design", "Revised design")
+ edited = add_version(2, content)
+ (3..23).each { |revision| add_version(revision, content) }
+
+ expect(described_class.call(plan: plan, keys: %w[design], since_revision: 1)).to eq("design" => edited)
+ end
+
+ it "does no history work when there are no section markers" do
+ expect(plan).not_to receive(:plan_versions)
+ expect(described_class.call(plan: plan, keys: [], since_revision: 1)).to eq({})
+ end
+end
diff --git a/spec/system/changed_sections_ux_spec.rb b/spec/system/changed_sections_ux_spec.rb
new file mode 100644
index 00000000..bf941888
--- /dev/null
+++ b/spec/system/changed_sections_ux_spec.rb
@@ -0,0 +1,358 @@
+require "rails_helper"
+
+RSpec.describe "Updated section signposts", type: :system do
+ let(:author) { create(:coplan_user) }
+ let(:viewer) { create(:coplan_user, email: "update-reader@example.com") }
+ let(:content) do
+ <<~MD
+ An introduction before the headings.
+
+ ## Design
+
+ Keep the prose easy to read.
+
+ ```ruby
+ Order.create!(context_rule_id: "rule-61")
+ ```
+
+ | Field | Purpose |
+ | --- | --- |
+ | Rule UID | Attribution |
+
+ ```mermaid
+ flowchart LR
+ Catalog --> Order
+ ```
+
+ ## Design
+
+ A second section with the same heading.
+
+ ## Rollout
+
+ Ship gradually.
+
+ ## Testing
+
+ Verify attribution.
+
+ ## References
+
+ Background reading stays unchanged.
+ MD
+ end
+ let(:plan) do
+ p = create(:plan, :published, created_by_user: author)
+ p.current_plan_version.update_columns(content_markdown: content, created_at: 2.hours.ago)
+ CoPlan::PlanViewer.create!(plan: p, user: viewer, last_seen_at: 1.hour.ago)
+ version = create(:plan_version, plan: p, revision: 2, actor_id: author.id,
+ content_markdown: content.sub("easy to read", "comfortable to read").sub("same heading", "same heading, now updated"))
+ p.update!(current_plan_version: version, current_revision: 2)
+ p
+ end
+
+ before do
+ plan
+ visit sign_in_path
+ fill_in "Email address", with: viewer.email
+ click_button "Sign In"
+ expect(page).to have_button("Menu")
+ visit plan_page_path(plan)
+ expect(page).to have_css(".plan-layout")
+ end
+
+ def broadcast_section_update(keys:, revision: 3, rewritten: false, rename: false)
+ page.execute_script(<<~JS)
+ const body = document.getElementById('plan-content-body')
+ const stream = document.createElement('turbo-stream')
+ stream.setAttribute('action', 'coplan-replace-if-clean')
+ stream.setAttribute('target', 'plan-content-body')
+ stream.setAttribute('data-revision', '#{revision}')
+ stream.setAttribute('data-section-update', JSON.stringify({by: 'Live editor', at: new Date().toISOString(), ago: 'just now', revision: #{revision}, keys: #{keys.to_json}, rewritten: #{rewritten}}))
+ const template = document.createElement('template')
+ template.innerHTML = body.innerHTML.replace('comfortable to read', 'a recent live revision')
+ .replace('Entirely new Design body.', 'Revised Design body.')
+ if (#{rename}) {
+ const heading = template.content.querySelector('#design')
+ heading.textContent = 'Approach'
+ heading.removeAttribute('id')
+ template.content.querySelector('.markdown-rendered').insertAdjacentHTML('beforeend', 'New section
Fresh material.
')
+ }
+ if (#{rewritten}) {
+ template.content.querySelector('.markdown-rendered').innerHTML = ['Design', 'Data', 'Rollout', 'Testing'].map(title => `${title}
Entirely new ${title} body.
`).join('')
+ }
+ stream.append(template)
+ document.body.append(stream)
+ JS
+ end
+
+ it "marks new and renamed sections introduced by a live edit and updates the notice count" do
+ broadcast_section_update(keys: %w[approach new-section], rename: true)
+ find("#approach .section-update-marker").hover
+ expect(page).to have_css('#approach .section-update-marker[aria-label*="Live editor"]')
+ expect(page).to have_css("#new-section.section-updated")
+ expect(page).to have_css(".changed-sections-note", text: "3 sections updated since your last visit.")
+ expect(page).to have_no_css("#design")
+ end
+
+ it "keeps dismissal for the same revision but shows new material from a later revision" do
+ click_button "Dismiss"
+ expect(page).to have_no_css(".changed-sections-note")
+ broadcast_section_update(keys: %w[design], revision: 2)
+ expect(page).to have_no_css(".changed-sections-note")
+ expect(page).to have_no_css(".section-update-marker")
+ broadcast_section_update(keys: [])
+ expect(page).to have_no_css(".changed-sections-note")
+
+ broadcast_section_update(keys: %w[design], revision: 4)
+ find("#design .section-update-marker").hover
+ expect(page).to have_css(".changed-sections-note", text: "1 section updated since your last visit.")
+ expect(page.evaluate_script("document.querySelector('.changed-sections-note').inert")).to be false
+ end
+
+ it "restores only the summary when a live rewrite follows dismissal" do
+ click_button "Dismiss"
+ broadcast_section_update(keys: [], rewritten: true)
+ expect(page).to have_css(".changed-sections-note", text: "Updated throughout since your last visit.")
+ expect(page).to have_no_css(".section-updated, .section-update-marker")
+ expect(page.evaluate_script("document.querySelector('.changed-sections-note').inert")).to be false
+ end
+
+ it "marks only fresh edits after an extensive-update notice is dismissed" do
+ broadcast_section_update(keys: [], rewritten: true)
+ expect(page).to have_css(".changed-sections-note", text: "Updated throughout")
+ click_button "Dismiss"
+ broadcast_section_update(keys: [], rewritten: true)
+ expect(page).to have_no_css(".changed-sections-note")
+
+ broadcast_section_update(keys: %w[design], revision: 4)
+ find("#design .section-update-marker").hover
+ expect(page).to have_css(".changed-sections-note", text: "1 section updated since your last visit.")
+ expect(page).to have_css(".section-updated", count: 1)
+ expect(page).to have_no_text("Updated throughout")
+ end
+
+ it "reveals the first live-update notice without shifting headings at the top of the page" do
+ window = page.current_window
+ original_size = window.size
+ [ [ 1400, 900 ], [ 390, 844 ] ].each do |size|
+ %w[light dark].each do |theme|
+ window.resize_to(*size)
+ CoPlan::PlanViewer.find_by!(plan: plan, user: viewer).update!(last_seen_at: Time.current)
+ visit plan_page_path(plan)
+ page.execute_script("document.documentElement.dataset.theme = '#{theme}'; window.scrollTo(0, 0)")
+ expect(page).to have_no_css(".changed-sections-note")
+ top = page.evaluate_script("document.getElementById('design').getBoundingClientRect().top")
+
+ broadcast_section_update(keys: %w[design])
+
+ expect(page).to have_css(".changed-sections-note", text: "1 section updated since your last visit.")
+ expect(page.evaluate_script("document.getElementById('design').getBoundingClientRect().top")).to eq(top)
+ expect(page.evaluate_script("window.scrollY")).to eq(0)
+ end
+ end
+ ensure
+ window.resize_to(*original_size) if original_size
+ end
+
+ it "marks only section starts and keeps rich content's own surfaces in both themes" do
+ %w[light dark].each do |theme|
+ page.execute_script("document.documentElement.dataset.theme = '#{theme}'")
+ expect(page).to have_css(".changed-sections-note", text: "2 sections updated since your last visit.")
+ expect(page).to have_css("h2.section-updated", count: 2)
+ expect(page).to have_no_css("p.section-updated, pre.section-updated, .table-wrapper.section-updated, .mermaid.section-updated")
+ expect(page.evaluate_script(<<~JS)).to be true
+ Array.from(document.querySelectorAll("h2.section-updated")).every(node => {
+ const style = getComputedStyle(node)
+ const marker = node.querySelector('.section-update-marker')
+ const target = getComputedStyle(marker)
+ const dot = getComputedStyle(marker, '::before')
+ return style.backgroundColor === "rgba(0, 0, 0, 0)" && style.boxShadow === "none" && style.paddingLeft === "0px" &&
+ target.position === "absolute" && parseFloat(target.width) >= 22 && parseFloat(target.height) >= 22 &&
+ dot.content === '\"\"' && dot.width === "5px"
+ })
+ JS
+ # The signpost must not become part of heading text, copied content,
+ # or the slug used by the outline and duplicate heading matching.
+ expect(page).to have_css(".content-nav__link-text", text: "Design", count: 2)
+ end
+ end
+
+ it "clears a viewed marker without shifting headings, and dismisses without moving content" do
+ expect(page).to have_no_button("Review updates ↓")
+ expect(page).to have_no_button("Next ↓")
+ marker = find("#design .section-update-marker")
+ marker.hover
+ top = page.evaluate_script("document.getElementById('plan-content-body').getBoundingClientRect().top + window.scrollY")
+ height = find("#design").native.rect.height
+ find_button("Menu").hover
+ expect(page).to have_css("#design.section-updated--viewed", wait: 5)
+ expect(page).to have_no_css("#design .section-update-marker")
+ expect(find("#design").native.rect.height).to eq(height)
+
+ click_button "Dismiss"
+ expect(page).to have_no_css(".section-update-marker")
+ expect(page).to have_no_css(".changed-sections-note")
+ page.execute_script(<<~JS)
+ const layout = document.querySelector('.plan-layout')
+ window.Stimulus.getControllerForElementAndIdentifier(layout, 'coplan--changed-sections').connect()
+ JS
+ expect(page).to have_no_css(".section-update-marker")
+ expect(page).to have_no_css(".changed-sections-note")
+ expect(page.evaluate_script("document.getElementById('plan-content-body').getBoundingClientRect().top + window.scrollY")).to eq(top)
+ end
+
+ it "shows attribution on hover or focus and keeps the marker while either is active" do
+ marker = find("#design .section-update-marker")
+ marker.hover
+ expect(marker["aria-label"]).to include("Updated by #{author.name}", "ago")
+ expect(page.evaluate_script("getComputedStyle(document.querySelector('#design .section-update-marker'), '::after').visibility")).to eq("visible")
+ # Wait past the read delay: hovering must keep metadata available.
+ sleep 3.2
+ expect(page).to have_no_css("#design.section-updated--viewed")
+ page.execute_script("document.querySelector('#design .section-update-marker').focus()")
+ find_button("Menu").hover
+ sleep 3.2
+ expect(page).to have_no_css("#design.section-updated--viewed")
+ expect(page.evaluate_script("getComputedStyle(document.querySelector('#design .section-update-marker'), '::after').visibility")).to eq("visible")
+ page.execute_script("document.activeElement.blur()")
+ expect(page).to have_css("#design.section-updated--viewed", wait: 5)
+ end
+
+ it "does not count a quick scroll past as viewing a section" do
+ page.execute_script("document.getElementById('design').scrollIntoView({block: 'center'})")
+ page.execute_script("document.getElementById('references').scrollIntoView({block: 'start'})")
+ sleep 3.2
+ expect(page).to have_no_css("#design.section-updated--viewed")
+ page.execute_script("document.getElementById('design').scrollIntoView({block: 'center'})")
+ expect(page).to have_css("#design.section-updated--viewed", wait: 5)
+ end
+
+ it "summarizes widespread changes once and offers history instead of marking the whole page" do
+ rewritten = content.scan(/^## (.+)$/).map { |heading| "## #{heading.first}\n\nEntirely new section body.\n" }.join("\n")
+ version = create(:plan_version, plan: plan, revision: 3, actor_id: author.id, content_markdown: rewritten)
+ plan.update!(current_plan_version: version, current_revision: 3)
+ CoPlan::PlanViewer.find_by!(plan: plan, user: viewer).update!(last_seen_at: 1.hour.ago)
+ visit plan_page_path(plan)
+ expect(page).to have_css(".changed-sections-note", text: "Updated throughout since your last visit.")
+ expect(page).to have_no_css(".section-updated")
+ within(".changed-sections-note") { click_link "History" }
+ expect(page).to have_current_path(plan_history_page_path(plan))
+ end
+
+ it "keeps mobile dots inside the card and gives the notice padded, separate rows" do
+ window = page.current_window
+ original_size = window.size
+ [ 320, 390, 481 ].each do |width|
+ %w[light dark].each do |theme|
+ window.resize_to(width, 853)
+ CoPlan::PlanViewer.find_by!(plan: plan, user: viewer).update!(last_seen_at: 1.hour.ago)
+ visit plan_page_path(plan)
+ page.execute_script("document.documentElement.dataset.theme = '#{theme}'")
+ find("#design .section-update-marker").hover
+ expect(page.evaluate_script(<<~JS)).to be true
+ (() => {
+ const card = document.querySelector('.plan-document').getBoundingClientRect()
+ const marker = document.querySelector('#design .section-update-marker')
+ const target = marker.getBoundingClientRect()
+ const note = document.querySelector('.changed-sections-note').getBoundingClientRect()
+ const summary = document.querySelector('.changed-sections-note__summary').getBoundingClientRect()
+ const controls = document.querySelector('.changed-sections-note__controls').getBoundingClientRect()
+ return target.left > card.left && target.right < card.right &&
+ summary.left >= note.left + 8 && summary.right <= note.right - 8 &&
+ controls.top >= summary.bottom && controls.right <= note.right - 8 &&
+ getComputedStyle(marker, '::after').visibility === 'visible' &&
+ document.documentElement.scrollWidth <= window.innerWidth
+ })()
+ JS
+ end
+ end
+ ensure
+ window.resize_to(*original_size) if original_size
+ end
+
+ it "reapplies signposts after a live content swap and remembers viewed sections" do
+ expect(page).to have_css("#design.section-updated--viewed", wait: 5)
+ page.execute_script(<<~JS)
+ const body = document.getElementById('plan-content-body')
+ body.innerHTML = body.innerHTML.replace('comfortable to read', 'pleasant to read')
+ body.dispatchEvent(new CustomEvent('coplan:content-updated', { bubbles: true }))
+ JS
+ expect(page).to have_css("h2.section-updated", count: 2)
+ expect(page).to have_css("#design.section-updated--viewed")
+ expect(page).to have_css(".changed-sections-note", count: 1)
+ end
+
+ %w[local remote].each do |source|
+ it "shows a fresh dot for a later #{source} edit, but not for the same edit twice" do
+ expect(page).to have_css("#design.section-updated--viewed", wait: 5)
+ page.execute_script(<<~JS)
+ const layout = document.querySelector('.plan-layout')
+ const body = document.getElementById('plan-content-body')
+ const updates = JSON.parse(layout.getAttribute('data-coplan--changed-sections-updates-value'))
+ if ('#{source}' === 'local') body.setAttribute('data-coplan--live-update-revision-value', '3')
+ const stream = document.createElement('turbo-stream')
+ stream.setAttribute('action', 'coplan-replace-if-clean')
+ stream.setAttribute('target', 'plan-content-body')
+ stream.setAttribute('data-revision', '3')
+ // Keep the timestamp identical to the earlier edit to test revision identity.
+ stream.setAttribute('data-section-update', JSON.stringify({...updates.design, by: 'Later editor', revision: 3, keys: ['design']}))
+ const template = document.createElement('template')
+ template.innerHTML = body.innerHTML.replace('comfortable to read', 'a later design')
+ stream.append(template)
+ document.body.append(stream)
+ JS
+ marker = find('#design:not(.section-updated--viewed) .section-update-marker[aria-label*="Later editor"]')
+ marker.hover
+ expect(marker["aria-label"]).to include("Later editor")
+ find_button("Menu").hover
+ expect(page).to have_css("#design.section-updated--viewed", wait: 5)
+
+ # A reconnect or repeat delivery of this revision must preserve its acknowledgement.
+ page.execute_script(<<~JS)
+ const layout = document.querySelector('.plan-layout')
+ const updates = JSON.parse(layout.getAttribute('data-coplan--changed-sections-updates-value'))
+ document.getElementById('plan-content-body').dispatchEvent(new CustomEvent('coplan:section-update', {
+ bubbles: true, detail: {keys: ['design'], update: updates.design}
+ }))
+ JS
+ expect(page).to have_css("#design.section-updated--viewed")
+ expect(page).to have_no_css("#design .section-update-marker")
+ end
+ end
+
+ [ 2, 3 ].each do |incoming_revision|
+ it "refreshes attribution at revision #{incoming_revision}, including a body already installed by a local save" do
+ find("#design .section-update-marker").hover
+ page.execute_script(<<~JS)
+ const body = document.getElementById('plan-content-body')
+ const stream = document.createElement('turbo-stream')
+ stream.setAttribute('action', 'coplan-replace-if-clean')
+ stream.setAttribute('target', 'plan-content-body')
+ stream.setAttribute('data-revision', '#{incoming_revision}')
+ stream.setAttribute('data-changed-sections', JSON.stringify({keys: ['design']}))
+ stream.setAttribute('data-section-update', JSON.stringify({by: 'Another editor', at: new Date().toISOString(), ago: 'less than a minute ago', revision: #{incoming_revision}, keys: ['design']}))
+ const template = document.createElement('template')
+ template.innerHTML = body.innerHTML.replace('comfortable to read', 'newly updated')
+ stream.append(template)
+ document.body.append(stream)
+ JS
+ expect(page).to have_css('#design .section-update-marker[aria-label*="Another editor"]')
+ expected_body = incoming_revision == 2 ? "comfortable to read" : "newly updated"
+ expect(page).to have_css('#plan-content-body', text: expected_body, wait: 5)
+ end
+ end
+
+ it "marks an unheaded introduction once and survives reconnecting without duplicating notices" do
+ page.execute_script(<<~JS)
+ const layout = document.querySelector('.plan-layout')
+ layout.setAttribute('data-coplan--changed-sections-keys-value', '["__top__"]')
+ const controller = window.Stimulus.getControllerForElementAndIdentifier(layout, 'coplan--changed-sections')
+ controller.connect()
+ controller.connect()
+ JS
+ expect(page).to have_css("p.section-updated", text: "An introduction", count: 1)
+ expect(page).to have_css(".changed-sections-note", count: 1)
+ expect(page).to have_css("p.section-updated--viewed", wait: 5)
+ end
+end
diff --git a/spec/system/deck_ux_spec.rb b/spec/system/deck_ux_spec.rb
index 6a7a1198..6482be20 100644
--- a/spec/system/deck_ux_spec.rb
+++ b/spec/system/deck_ux_spec.rb
@@ -162,6 +162,73 @@ def current_slide
expect(page).to have_css(".deck-slide--current[data-slide='2']", visible: true)
end
+ def queue_section_edits(revisions:, rewritten: false)
+ page.evaluate_async_script(<<~JS)
+ const done = arguments[0]
+ fetch("#{content_body_plan_path(plan)}", { headers: { Accept: "text/html" } })
+ .then(response => response.text())
+ .then(html => {
+ for (const revision of #{revisions.to_json}) {
+ const keys = #{rewritten} && revision === 3 ? [] :
+ (revision === 3 ? ['what-the-classifier-sees'] : ['before-the-readout'])
+ const stream = document.createElement('turbo-stream')
+ stream.setAttribute('action', 'coplan-replace-if-clean')
+ stream.setAttribute('target', 'plan-content-body')
+ stream.setAttribute('data-revision', revision)
+ stream.setAttribute('data-changed-sections', JSON.stringify({keys}))
+ stream.setAttribute('data-section-update', JSON.stringify({
+ by: revision === 3 ? 'First editor' : 'Second editor', at: new Date().toISOString(),
+ ago: 'just now', revision, keys, rewritten: #{rewritten} && revision === 3
+ }))
+ const template = document.createElement('template')
+ template.innerHTML = html.replaceAll('A lone heading becomes a title slide', 'Title slide from the first editor')
+ if (revision === 4) template.innerHTML = template.innerHTML.replaceAll('Send the deck round', 'Checklist from the second editor')
+ stream.append(template)
+ document.body.append(stream)
+ }
+ done(true)
+ })
+ JS
+ expect(page).to have_no_css('turbo-stream[action="coplan-replace-if-clean"]', visible: :all)
+ expect(page.evaluate_script("document.getElementById('plan-content-body').__pendingDeckUpdate?.incomingRevision")).to eq(4)
+ end
+
+ [ [ 3, 4 ], [ 4, 3 ] ].each do |revisions|
+ it "keeps queued changes and their editors when revisions arrive as #{revisions.join(', ')} during a show" do
+ visit plan_page_path(plan)
+ start_show
+ queue_section_edits(revisions: revisions)
+ expect(page).to have_css(".deck--presenting")
+ expect(page).to have_no_text("Checklist from the second editor")
+
+ send_keys(:escape)
+
+ expect(page).to have_no_css(".deck--presenting")
+ expect(page).to have_css(".changed-sections-note", text: "2 sections updated")
+ expect(page).to have_css('#what-the-classifier-sees .section-update-marker[aria-label*="First editor"]', visible: :all)
+ expect(page).to have_css('#before-the-readout .section-update-marker[aria-label*="Second editor"]', visible: :all)
+ find(".deck-toolbar__step--next").click
+ find('#what-the-classifier-sees .section-update-marker').hover
+ expect(page).to have_css('.deck-slide--current', text: "Title slide from the first editor")
+ 2.times { find(".deck-toolbar__step--next").click }
+ find('#before-the-readout .section-update-marker').hover
+ expect(page).to have_css('.deck-slide--current', text: "Checklist from the second editor")
+ expect(page.evaluate_script("document.getElementById('plan-content-body').getAttribute('data-coplan--live-update-revision-value')")).to eq("4")
+ end
+ end
+
+ it "keeps an extensive-update notice queued before a later minor edit during a show" do
+ visit plan_page_path(plan)
+ start_show
+ queue_section_edits(revisions: [ 3, 4 ], rewritten: true)
+
+ send_keys(:escape)
+
+ expect(page).to have_no_css(".deck--presenting")
+ expect(page).to have_css(".changed-sections-note", text: "Updated throughout since your last visit.")
+ expect(page).to have_no_css(".section-update-marker", visible: :all)
+ end
+
it "keeps slide positions with their decks when id-less decks reorder" do
mixed = <<~MD
::: {.presentation}
@@ -408,8 +475,9 @@ def current_slide
window.Stimulus.getControllerForElementAndIdentifier(layout, "coplan--changed-sections").connect()
JS
- expect(page).to have_css(".deck-body h2.section-changed", text: "Results")
- expect(page).to have_css(".deck-body p.section-changed", text: "Analysis body.")
+ expect(page).to have_css(".deck-body h2.section-updated", text: "Results")
+ expect(page).to have_no_css(".deck-body p.section-updated")
+ expect(page).to have_css(".deck-slide--current h2.section-updated--viewed", text: "Results", wait: 5)
end
it "keeps the reader's slide when the inline editor closes" do
@@ -596,10 +664,10 @@ def current_slide
const controller = window.Stimulus?.getControllerForElementAndIdentifier(layout, "coplan--changed-sections")
controller?.connect()
JS
- expect(page).to have_css(".markdown-rendered .section-changed", text: "Fresh closing text.")
+ expect(page).to have_css(".markdown-rendered h1.section-updated", text: "Closing")
end
- it "keeps changed section bands out of discussion bodies" do
+ it "keeps update markers out of discussion bodies" do
content = "# Closing\n\nFresh closing text."
CoPlan::Plans::ReplaceContent.call(plan: plan, new_content: content,
base_revision: plan.current_revision, actor_type: "human", actor_id: user.id)
@@ -612,8 +680,8 @@ def current_slide
window.Stimulus.getControllerForElementAndIdentifier(layout, "coplan--changed-sections").connect()
JS
- expect(page).to have_css("#plan-content-body p.section-changed--end", text: "Fresh closing text.")
- expect(page).to have_no_css("#plan-threads .section-changed", visible: :all)
+ expect(page).to have_css("#plan-content-body h1.section-updated", text: "Closing")
+ expect(page).to have_no_css("#plan-threads .section-updated", visible: :all)
end
it "flashes a live change in a later content region" do