github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 07:53:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Use include-subcategories filter in report export (#10007)

Browse Source 
Some filters were renamed and the conversion of the filter names and arguments
was removed.
This commit is contained in:
Dan Ungureanu
2020-06-10 18:57:39 +03:00
committed by GitHub
parent 274db95fb2
commit 3a7ca97c36
8 changed files with 76 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
spec/models/report_spec.rb
View File

@ -771,7 +771,7 @@ describe Report do
include_examples 'category filtering'
context "on subcategories" do
let(:report) { Report.find('flags', filters: { category: c0.id, 'include-subcategories': true }) }
let(:report) { Report.find('flags', filters: { category: c0.id, 'include_subcategories': true }) }
include_examples 'category filtering on subcategories'
end
@ -801,7 +801,7 @@ describe Report do
include_examples 'category filtering'
context "on subcategories" do
let(:report) { Report.find('topics', filters: { category: c0.id, 'include-subcategories': true }) }
let(:report) { Report.find('topics', filters: { category: c0.id, 'include_subcategories': true }) }
include_examples 'category filtering on subcategories'
end
@ -892,7 +892,7 @@ describe Report do
include_examples 'category filtering'
context "on subcategories" do
let(:report) { Report.find('posts', filters: { category: c0.id, 'include-subcategories': true }) }
let(:report) { Report.find('posts', filters: { category: c0.id, 'include_subcategories': true }) }
include_examples 'category filtering on subcategories'
end
@ -924,7 +924,7 @@ describe Report do
include_examples 'category filtering'
context "on subcategories" do
let(:report) { Report.find('topics_with_no_response', filters: { category: c0.id, 'include-subcategories': true }) }
let(:report) { Report.find('topics_with_no_response', filters: { category: c0.id, 'include_subcategories': true }) }
include_examples 'category filtering on subcategories'
end
@ -960,7 +960,7 @@ describe Report do
include_examples 'category filtering'
context "on subcategories" do
let(:report) { Report.find('likes', filters: { category: c0.id, 'include-subcategories': true }) }
let(:report) { Report.find('likes', filters: { category: c0.id, 'include_subcategories': true }) }
include_examples 'category filtering on subcategories'
end
@ -1236,4 +1236,33 @@ describe Report do
end
end
end
describe "top_uploads" do
context "with no data" do
it "works" do
report = Report.find("top_uploads")
expect(report.data).to be_empty
end
end
context "with data" do
fab!(:jpg_upload) { Fabricate(:upload, extension: :jpg) }
fab!(:png_upload) { Fabricate(:upload, extension: :png) }
it "works" do
report = Report.find("top_uploads")
expect(report.data.length).to eq(2)
expect(report.data.map { |row| row[:extension] }).to contain_exactly("jpg", "png")
end
it "works with filters" do
report = Report.find("top_uploads", filters: { file_extension: "jpg" })
expect(report.data.length).to eq(1)
expect(report.data[0][:extension]).to eq("jpg")
end
end
end
end