Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: flaky test in reports (#7255) 

* FIX: flaky test in reports
This commit is contained in:
Tarek Khalil 2019-03-26 13:23:57 +00:00 committed by GitHub
parent cf9d8c1ad3
commit 41563ba6b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
spec/models/report_spec.rb
View File

@ -1076,11 +1076,13 @@ describe Report do
it "works" do it "works" do
expect(report.data.length).to eq(2) expect(report.data.length).to eq(2)
expect_row_to_be_equal(report.data[0], khalil, khalil_upload) expect_uploads_report_data_to_be_equal(report.data, khalil, khalil_upload)
expect_row_to_be_equal(report.data[1], tarek, tarek_upload) expect_uploads_report_data_to_be_equal(report.data, tarek, tarek_upload)
end
end end
def expect_row_to_be_equal(row, user, upload) def expect_uploads_report_data_to_be_equal(data, user, upload)
row = data.find { |r| r[:author_id] == user.id }
expect(row[:author_id]).to eq(user.id) expect(row[:author_id]).to eq(user.id)
expect(row[:author_username]).to eq(user.username) expect(row[:author_username]).to eq(user.username)
expect(row[:author_avatar_template]).to eq(User.avatar_template(user.username, user.uploaded_avatar_id)) expect(row[:author_avatar_template]).to eq(User.avatar_template(user.username, user.uploaded_avatar_id))
@ -1089,7 +1091,6 @@ describe Report do
expect(row[:file_url]).to eq(Discourse.store.cdn_url(upload.url)) expect(row[:file_url]).to eq(Discourse.store.cdn_url(upload.url))
expect(row[:file_name]).to eq(upload.original_filename.truncate(25)) expect(row[:file_name]).to eq(upload.original_filename.truncate(25))
end end
end
include_examples "no data" include_examples "no data"
end end
@ -1108,16 +1109,9 @@ describe Report do
it "works" do it "works" do
expect(report.data.length).to eq(2) expect(report.data.length).to eq(2)
expect_row_to_be_equal(report.data[0], john, 1, 0)
expect_row_to_be_equal(report.data[1], matt, 1, 0)
end
def expect_row_to_be_equal(row, user, ignores, mutes) expect_ignored_users_report_data_to_be_equal(report.data, john, 1, 0)
expect(row[:ignored_user_id]).to eq(user.id) expect_ignored_users_report_data_to_be_equal(report.data, matt, 1, 0)
expect(row[:ignored_username]).to eq(user.username)
expect(row[:ignored_user_avatar_template]).to eq(User.avatar_template(user.username, user.uploaded_avatar_id))
expect(row[:ignores_count]).to eq(ignores)
expect(row[:mutes_count]).to eq(mutes)
end end
context "when muted users exist" do context "when muted users exist" do
@ -1128,12 +1122,22 @@ describe Report do
it "works" do it "works" do
expect(report.data.length).to eq(2) expect(report.data.length).to eq(2)
expect_row_to_be_equal(report.data[0], john, 1, 1) expect_ignored_users_report_data_to_be_equal(report.data, john, 1, 1)
expect_row_to_be_equal(report.data[1], matt, 1, 1) expect_ignored_users_report_data_to_be_equal(report.data, matt, 1, 1)
end end
end end
end end
def expect_ignored_users_report_data_to_be_equal(data, user, ignores, mutes)
row = data.find { |r| r[:ignored_user_id] == user.id }
expect(row).to be_present
expect(row[:ignored_user_id]).to eq(user.id)
expect(row[:ignored_username]).to eq(user.username)
expect(row[:ignored_user_avatar_template]).to eq(User.avatar_template(user.username, user.uploaded_avatar_id))
expect(row[:ignores_count]).to eq(ignores)
expect(row[:mutes_count]).to eq(mutes)
end
include_examples "no data" include_examples "no data"
end end