Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions lib/canvas/live_events.rb
Original file line number Diff line number Diff line change
Expand Up @@ -605,11 +605,12 @@ def self.wiki_page_created(page)
})
end

def self.wiki_page_updated(page, old_title, old_body)
def self.wiki_page_updated(page, old_title, old_body, old_workflow_state)
payload = {
wiki_page_id: page.global_id,
title: LiveEvents.truncate(page.title),
body: LiveEvents.truncate(page.body)
body: LiveEvents.truncate(page.body),
workflow_state: page.workflow_state,
}

if old_title
Expand All @@ -620,6 +621,10 @@ def self.wiki_page_updated(page, old_title, old_body)
payload[:old_body] = LiveEvents.truncate(old_body)
end

if old_workflow_state
payload[:old_workflow_state] = old_workflow_state
end

post_event_stringified("wiki_page_updated", payload)
end

Expand Down
5 changes: 3 additions & 2 deletions lib/canvas/live_events_callbacks.rb
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,11 @@ def self.after_update(obj, changes)
when GroupMembership
Canvas::LiveEvents.group_membership_updated(obj)
when WikiPage
if changes["title"] || changes["body"]
if changes["title"] || changes["body"] || changes["workflow_state"]
Canvas::LiveEvents.wiki_page_updated(obj,
changes["title"]&.first,
changes["body"]&.first)
changes["body"]&.first,
changes["workflow_state"]&.first)
end
when Assignment
Canvas::LiveEvents.assignment_updated(obj)
Expand Down
32 changes: 26 additions & 6 deletions spec/lib/canvas/live_events_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -290,15 +290,21 @@ def body
@page = @course.wiki_pages.create(title: "old title", body: "old body")
end

def wiki_page_updated
Canvas::LiveEvents.wiki_page_updated(@page, @page.title_changed? ? @page.title_was : nil, @page.body_changed? ? @page.body_was : nil)
def wiki_page_updated(old_workflow_state: nil)
Canvas::LiveEvents.wiki_page_updated(
@page,
@page.title_changed? ? @page.title_was : nil,
@page.body_changed? ? @page.body_was : nil,
old_workflow_state
)
end

it "does not set old_title or old_body if they don't change" do
it "does not set old_title, old_body, or old_workflow_state if they don't change" do
expect_event("wiki_page_updated", {
wiki_page_id: @page.global_id.to_s,
title: "old title",
body: "old body"
body: "old body",
workflow_state: @page.workflow_state
})

wiki_page_updated
Expand All @@ -311,7 +317,8 @@ def wiki_page_updated
wiki_page_id: @page.global_id.to_s,
title: "new title",
old_title: "old title",
body: "old body"
body: "old body",
workflow_state: @page.workflow_state
})

wiki_page_updated
Expand All @@ -324,11 +331,24 @@ def wiki_page_updated
wiki_page_id: @page.global_id.to_s,
title: "old title",
body: "new body",
old_body: "old body"
old_body: "old body",
workflow_state: @page.workflow_state
})

wiki_page_updated
end

it "sets old_workflow_state if the workflow_state changed" do
expect_event("wiki_page_updated", {
wiki_page_id: @page.global_id.to_s,
title: "old title",
body: "old body",
workflow_state: @page.workflow_state,
old_workflow_state: "unpublished"
})

wiki_page_updated(old_workflow_state: "unpublished")
end
end

describe ".conversation_forwarded" do
Expand Down
16 changes: 14 additions & 2 deletions spec/observers/live_events_observer_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,14 @@

it "posts update events for title" do
wiki_page_model(title: "old title")
expect(Canvas::LiveEvents).to receive(:wiki_page_updated).with(@page, "old title", nil)
expect(Canvas::LiveEvents).to receive(:wiki_page_updated).with(@page, "old title", nil, nil)
@page.title = "new title"
@page.save
end

it "posts update events for body" do
wiki_page_model(body: "old body")
expect(Canvas::LiveEvents).to receive(:wiki_page_updated).with(@page, nil, "old body")
expect(Canvas::LiveEvents).to receive(:wiki_page_updated).with(@page, nil, "old body", nil)
@page.body = "new body"
@page.save
end
Expand All @@ -106,6 +106,18 @@
expect(Canvas::LiveEvents).to receive(:wiki_page_deleted).once
@page.destroy_permanently!
end

it "posts update event when page is published" do
wiki_page_model(workflow_state: "unpublished")
expect(Canvas::LiveEvents).to receive(:wiki_page_updated).with(@page, nil, nil, "unpublished").once
@page.publish!
end

it "posts update event when page is unpublished" do
wiki_page_model
expect(Canvas::LiveEvents).to receive(:wiki_page_updated).with(@page, nil, nil, "active").once
@page.unpublish!
end
end

describe "attachment" do
Expand Down