Revert "freeze time in conversations show spec to make ree travis happy"
as it did not work :/
This reverts commit d668b21cd4.
This commit is contained in:
parent
d668b21cd4
commit
39c7478b4a
1 changed files with 4 additions and 6 deletions
|
|
@ -154,12 +154,10 @@ describe ConversationsController do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'succeeds with json' do
|
it 'succeeds with json' do
|
||||||
Timecop.freeze do
|
get :show, :id => @conversation.id, :format => :json
|
||||||
get :show, :id => @conversation.id, :format => :json
|
response.should be_success
|
||||||
response.should be_success
|
assigns[:conversation].should == @conversation
|
||||||
assigns[:conversation].should == @conversation
|
response.body.should == @conversation.to_json
|
||||||
response.body.should == @conversation.to_json
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'redirects to index' do
|
it 'redirects to index' do
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue