github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-04 11:11:13 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3065 from fantasticfears/fix-visits-report

Browse Source 
FIX: today visits not shown
This commit is contained in:
Régis Hanol
2014-12-29 21:23:47 +01:00
parent f7955406cc fe7f2c6979
commit a04f44d65a
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/report.rb
View File

@ -46,7 +46,7 @@ class Report
end end
def self.report_visits(report) def self.report_visits(report)
basic_report_about report, UserVisit, :by_day, report.start_date, report.end_date basic_report_about report, UserVisit, :by_day, report.start_date, report.end_date.change(hour: 24)
end end
def self.report_signups(report) def self.report_signups(report)

5
spec/models/report_spec.rb
View File

@ -15,6 +15,7 @@ describe Report do
let(:user) { Fabricate(:user) } let(:user) { Fabricate(:user) }
before do before do
user.user_visits.create(visited_at: 1.hour.ago)
user.user_visits.create(visited_at: 1.day.ago) user.user_visits.create(visited_at: 1.day.ago)
user.user_visits.create(visited_at: 2.days.ago) user.user_visits.create(visited_at: 2.days.ago)
end end
@ -22,6 +23,10 @@ describe Report do
it "returns a report with data" do it "returns a report with data" do
report.data.should be_present report.data.should be_present
end end
it "return today's visit" do
report.data.select { |v| v[:x].today? }.should be_present
end
end end
end end