IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Fix flaky time sensitive uploads.rake specs (#9283)

Browse Source 
Also fix issues in spec where certain uploads were not considered secure
This commit is contained in:
Martin Brennan
2020-03-26 13:31:39 +10:00
committed by GitHub
parent ecbccab159
commit efd5fb665b
3 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tasks/uploads.rake
View File

@@ -768,7 +768,7 @@ def adjust_acls(uploads_to_adjust_acl_for)
Discourse.store.update_upload_ACL(upload) Discourse.store.update_upload_ACL(upload)
i += 1 i += 1
end end
RakeHelpers.print_status_with_label("Updaing ACLs complete! ", i, total_count) RakeHelpers.print_status_with_label("Updating ACLs complete! ", i, total_count)
end end
def mark_all_as_secure_login_required(uploads_to_update) def mark_all_as_secure_login_required(uploads_to_update)

3
spec/support/time_matcher.rb
View File

@@ -16,4 +16,7 @@ RSpec::Matchers.define :eq_time do |expected_time|
failure_message do |actual_time| failure_message do |actual_time|
"#{actual_time} is not within 1 millisecond of #{expected_time}" "#{actual_time} is not within 1 millisecond of #{expected_time}"
end end
failure_message_when_negated do |actual_time|
"#{actual_time} is within 1 millisecond of #{expected_time}"
end
end end

37
spec/tasks/uploads_spec.rb
View File

@@ -81,16 +81,19 @@ RSpec.describe "tasks/uploads" do
expect(upload1.reload.secure).to eq(false) expect(upload1.reload.secure).to eq(false)
end end
it "rebakes the posts attached" do it "rebakes the posts attached for uploads that change secure status" do
post1_baked = post1.baked_at post3.topic.update(category: Fabricate(:private_category, group: Fabricate(:group)))
post2_baked = post2.baked_at freeze_time
post3_baked = post3.baked_at
post1.update_columns(baked_at: 1.week.ago)
post2.update_columns(baked_at: 1.week.ago)
post3.update_columns(baked_at: 1.week.ago)
invoke_task invoke_task
expect(post1.reload.baked_at).not_to eq(post1_baked) expect(post1.reload.baked_at).to eq_time(1.week.ago)
expect(post2.reload.baked_at).not_to eq(post2_baked) expect(post2.reload.baked_at).to eq_time(1.week.ago)
expect(post3.reload.baked_at).not_to eq(post3_baked) expect(post3.reload.baked_at).not_to eq_time(1.week.ago)
end end
context "for an upload that is already secure and does not need to change" do context "for an upload that is already secure and does not need to change" do
@@ -98,12 +101,17 @@ RSpec.describe "tasks/uploads" do
post3.topic.update(archetype: 'private_message', category: nil) post3.topic.update(archetype: 'private_message', category: nil)
upload2.update(access_control_post: post3) upload2.update(access_control_post: post3)
upload2.update_secure_status upload2.update_secure_status
upload3.update(access_control_post: post3)
upload3.update_secure_status
end end
it "does not rebake the associated post" do it "does not rebake the associated post" do
post3_baked = post3.baked_at.to_s freeze_time
post3.update_columns(baked_at: 1.week.ago)
invoke_task invoke_task
expect(post3.reload.baked_at.to_s).to eq(post3_baked)
expect(post3.reload.baked_at).to eq_time(1.week.ago)
end end
it "does not attempt to update the acl" do it "does not attempt to update the acl" do
@@ -168,11 +176,14 @@ RSpec.describe "tasks/uploads" do
end end
it "rebakes the associated posts" do it "rebakes the associated posts" do
baked_post1 = post1.baked_at freeze_time
baked_post2 = post2.baked_at
post1.update_columns(baked_at: 1.week.ago)
post2.update_columns(baked_at: 1.week.ago)
invoke_task invoke_task
expect(post1.reload.baked_at).not_to eq(baked_post1)
expect(post2.reload.baked_at).not_to eq(baked_post2) expect(post1.reload.baked_at).not_to eq_time(1.week.ago)
expect(post2.reload.baked_at).not_to eq_time(1.week.ago)
end end
it "updates the affected ACLs" do it "updates the affected ACLs" do