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

Merge branch 'master' into api-dev

Browse Source
This commit is contained in:
Alberto Miedes Garcés
2016-12-03 13:53:13 +01:00
parent 6013f84945 dd406cfeb0
commit fdea4ad6ac
69 changed files with 1408 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spec/lib/email_digests_spec.rb
View File

@@ -51,7 +51,7 @@ describe EmailDigest do
user = create(:user)
proposal_notification = create(:proposal_notification)
notification = create(:notification, notifiable: proposal_notification, user: user, emailed_at: Time.now)
notification = create(:notification, notifiable: proposal_notification, user: user, emailed_at: Time.current)
email_digest = EmailDigest.new(user)
expect(email_digest.pending_notifications?).to_not be
@@ -85,7 +85,7 @@ describe EmailDigest do
user = create(:user)
proposal_notification = create(:proposal_notification)
create(:notification, notifiable: proposal_notification, user: user, emailed_at: Time.now)
create(:notification, notifiable: proposal_notification, user: user, emailed_at: Time.current)
reset_mailer
email_digest = EmailDigest.new(user)
@@ -124,4 +124,4 @@ describe EmailDigest do
end
end
end