FIX: make staff_edit_locks_post work with download_remote_images_to_local

This commit is contained in:
Maja Komel 2018-12-02 20:59:00 +01:00 committed by Sam
parent 125bb46052
commit 6121d11187
2 changed files with 13 additions and 1 deletions

View File

@ -176,6 +176,7 @@ class PostRevisor
!@post.wiki? &&
@fields.has_key?('raw') &&
@editor.staff? &&
@editor != Discourse.system_user &&
!@post.user.staff?
)
PostLocker.new(@post, @editor).lock

View File

@ -546,7 +546,7 @@ describe PostRevisor do
expect(post).to be_locked
end
it "doesn't wiki posts" do
it "doesn't lock the wiki posts" do
post.wiki = true
result = subject.revise!(
moderator,
@ -556,6 +556,7 @@ describe PostRevisor do
post.reload
expect(post).not_to be_locked
end
it "doesn't lock the post when the raw did not change" do
result = subject.revise!(
moderator,
@ -577,6 +578,16 @@ describe PostRevisor do
expect(post).not_to be_locked
end
it "doesn't lock the post when revised by system user" do
result = subject.revise!(
Discourse.system_user,
raw: "I usually replace hotlinked images"
)
expect(result).to eq(true)
post.reload
expect(post).not_to be_locked
end
it "doesn't lock a staff member's post" do
staff_post = Fabricate(:post, user: moderator)
revisor = PostRevisor.new(staff_post)