consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1651 from consul/fix/direct_message_today_scope

Browse Source 
Fix DirectMessage today scope
This commit is contained in:
Raimond Garcia
2017-06-14 11:42:54 +02:00
committed by GitHub
parent 8bcb50d801 cc0146e372
commit ae82a563d6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/direct_message.rb
View File

@@ -8,7 +8,7 @@ class DirectMessage < ActiveRecord::Base
validates :receiver, presence: true validates :receiver, presence: true
validate :max_per_day validate :max_per_day
scope :today, lambda { where('DATE(created_at) = ?', Date.current) } scope :today, lambda { where('DATE(created_at) = DATE(?)', Time.current) }
def max_per_day def max_per_day
return if errors.any? return if errors.any?

6
spec/models/direct_message_spec.rb
View File

@@ -65,9 +65,9 @@ describe DirectMessage do
describe "today" do describe "today" do
it "should return direct messages created today" do it "should return direct messages created today" do
direct_message1 = create(:direct_message, created_at: Time.current.beginning_of_day + 3.hours) direct_message1 = create(:direct_message, created_at: Time.now.utc.beginning_of_day + 3.hours)
direct_message2 = create(:direct_message, created_at: Time.current) direct_message2 = create(:direct_message, created_at: Time.now.utc)
direct_message3 = create(:direct_message, created_at: Time.current.end_of_day) direct_message3 = create(:direct_message, created_at: Time.now.utc.end_of_day)
expect(DirectMessage.today.count).to eq 3 expect(DirectMessage.today.count).to eq 3
end end