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

FEATURE: Include muted users count within the ignored users report (#7230)

Browse Source
This commit is contained in:
Tarek Khalil
2019-03-21 13:31:45 +00:00
committed by Régis Hanol
parent c18a6069c2
commit 605530a77f
4 changed files with 62 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spec/models/report_spec.rb
View File

@@ -1108,15 +1108,29 @@ describe Report do
it "works" do
expect(report.data.length).to eq(2)
expect_row_to_be_equal(report.data[0], john)
expect_row_to_be_equal(report.data[1], matt)
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)
def expect_row_to_be_equal(row, user, ignores, mutes)
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(1)
expect(row[:ignores_count]).to eq(ignores)
expect(row[:mutes_count]).to eq(mutes)
end
context "when muted users exist" do
before do
Fabricate(:muted_user, user: tarek, muted_user: john)
Fabricate(:muted_user, user: tarek, muted_user: matt)
end
it "works" do
expect(report.data.length).to eq(2)
expect_row_to_be_equal(report.data[0], john, 1, 1)
expect_row_to_be_equal(report.data[1], matt, 1, 1)
end
end
end