summaryrefslogtreecommitdiff
path: root/test/models/node_trash_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'test/models/node_trash_test.rb')
-rw-r--r--test/models/node_trash_test.rb10
1 files changed, 7 insertions, 3 deletions
diff --git a/test/models/node_trash_test.rb b/test/models/node_trash_test.rb
index 3947f20e..a4774c58 100644
--- a/test/models/node_trash_test.rb
+++ b/test/models/node_trash_test.rb
@@ -76,7 +76,8 @@ class NodeTrashTest < ActiveSupport::TestCase
76 node.trash!(@user1) 76 node.trash!(@user1)
77 target = Node.root.children.create!(:slug => "restore_target") 77 target = Node.root.children.create!(:slug => "restore_target")
78 78
79 node.reload.restore_from_trash!(target, @user1) 79 node.reload.draft.update!(:parent_node_id => target.id)
80 node.reload.restore_from_trash!(@user1)
80 node.reload 81 node.reload
81 82
82 assert_equal target, node.parent 83 assert_equal target, node.parent
@@ -91,8 +92,11 @@ class NodeTrashTest < ActiveSupport::TestCase
91 node.trash!(@user1) 92 node.trash!(@user1)
92 other_trashed = Node.trash.children.create!(:slug => "also_trashed") 93 other_trashed = Node.trash.children.create!(:slug => "also_trashed")
93 94
94 assert_raises(ActiveRecord::RecordInvalid) { node.reload.restore_from_trash!(Node.trash, @user1) } 95 node.reload.draft.update!(:parent_node_id => Node.trash.id)
95 assert_raises(ActiveRecord::RecordInvalid) { node.reload.restore_from_trash!(other_trashed, @user1) } 96 assert_raises(ActiveRecord::RecordInvalid) { node.reload.restore_from_trash!(@user1) }
97
98 node.reload.draft.update!(:parent_node_id => other_trashed.id)
99 assert_raises(ActiveRecord::RecordInvalid) { node.reload.restore_from_trash!(@user1) }
96 end 100 end
97 101
98 test "destroy_from_trash! refuses nodes outside the Trash" do 102 test "destroy_from_trash! refuses nodes outside the Trash" do