codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 17:46:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove timecop, specs were failing and we can avoid it here anyway

Browse source
This commit is contained in:
Sam 2013-06-28 15:14:44 +10:00
parent e63bfd2f4c
commit 3c67cf8acd
2 changed files with 6 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/user.rb
View file

@ -282,8 +282,8 @@ class User < ActiveRecord::Base
end
end
def update_last_seen!
now = Time.zone.now
def update_last_seen!(now=nil)
now ||= Time.zone.now
now_date = now.to_date
# Only update last seen once every minute
redis_key = "user:#{self.id}:#{now_date.to_s}"

29
spec/models/user_spec.rb
View file

@ -599,12 +599,7 @@ describe User do
let!(:first_visit_date) { Time.zone.now }
before do
Timecop.freeze(first_visit_date)
user.update_last_seen!
end
after do
Timecop.return
user.update_last_seen!(first_visit_date)
end
it "should have no value" do
@ -613,13 +608,7 @@ describe User do
describe "another call right after" do
before do
# A different time, to make sure it doesn't change
Timecop.freeze(10.minutes.from_now)
user.update_last_seen!
end
after do
Timecop.return
user.update_last_seen!(10.minutes.from_now)
end
it "still has no value" do
@ -631,12 +620,7 @@ describe User do
let!(:second_visit_date) { 2.hours.from_now }
before do
Timecop.freeze(second_visit_date)
user.update_last_seen!
end
after do
Timecop.return
user.update_last_seen!(second_visit_date)
end
it "should have the previous visit value" do
@ -648,12 +632,7 @@ describe User do
let!(:third_visit_date) { 5.hours.from_now }
before do
Timecop.freeze(third_visit_date)
user.update_last_seen!
end
after do
Timecop.return
user.update_last_seen!(third_visit_date)
end
it "should have the second visit value" do