Skip to content

Commit 022abc6

Browse files
committed
don't delete side comments when an entry is destroyed
test plan: * Create an entry in a discussion, and make some side comments on it * Delete the first entry * Verify that the side comments were not deleted as well. Change-Id: I1eea75877e39f2df56fa4e0013c5bd1649407359 Reviewed-on: https://gerrit.instructure.com/9656 Reviewed-by: Brian Whitmer <brian@instructure.com> Tested-by: Hudson <hudson@instructure.com>
1 parent 4da8dc2 commit 022abc6

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

app/models/discussion_entry.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ def plaintext_message(length=250)
158158

159159
alias_method :destroy!, :destroy
160160
def destroy
161-
flattened_discussion_subentries.destroy_all
162161
self.workflow_state = 'deleted'
163162
self.deleted_at = Time.now
164163
save!

spec/models/discussion_entry_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
describe DiscussionEntry do
2222

23-
it "should be marked as deleted when parent is deleted" do
23+
it "should not be marked as deleted when parent is deleted" do
2424
topic = course.discussion_topics.create!
2525
entry = topic.discussion_entries.create!
2626

@@ -31,8 +31,8 @@
3131
topic.discussion_entries.active.length.should == 2
3232
entry.destroy
3333
sub_entry.reload
34-
sub_entry.should be_deleted
35-
topic.discussion_entries.active.length.should == 0
34+
sub_entry.should_not be_deleted
35+
topic.discussion_entries.active.length.should == 1
3636
end
3737

3838
it "should preserve parent_id if valid" do

0 commit comments

Comments
 (0)