Skip to content

Commit ddc2ff6

Browse files
AJ ChristensenEl Draper
authored andcommitted
Updated User model specs that were broken a few patches back by me (doh)
Updated spec.opts to print coloured specdocs when you rake spec
1 parent 4904834 commit ddc2ff6

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

spec/models/user_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201
it "should set remember_token_expires_at to a specific date" do
202202
time = Time.mktime(2009,12,25)
203203
@user.remember_me_until(time)
204-
@user.remember_token_expires_at.should == time
204+
@user.remember_token_expires_at.should == DateTime.parse(time.to_s)
205205
end
206206

207207
it "should set the remember_me token when remembering" do
@@ -218,14 +218,14 @@
218218
today = Time.now
219219
remember_until = today + (2* Merb::Const::WEEK)
220220
@user.remember_me_for( Merb::Const::WEEK * 2)
221-
@user.remember_token_expires_at.should == (remember_until)
221+
@user.remember_token_expires_at.should == DateTime.parse(remember_until.to_s)
222222
end
223223

224224
it "should remember_me for two weeks" do
225225
t = Time.now
226226
Time.stub!(:now).and_return(t)
227227
@user.remember_me
228-
@user.remember_token_expires_at.should == (Time.now + (2 * Merb::Const::WEEK ))
228+
@user.remember_token_expires_at.should == DateTime.parse((Time.now + (2 * Merb::Const::WEEK )).to_s)
229229
end
230230

231231
it "should forget me" do

spec/spec.opts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
--format
2+
specdoc
3+
--colour

0 commit comments

Comments
 (0)