diff --git a/spec/controllers/conversations_controller_spec.rb b/spec/controllers/conversations_controller_spec.rb index 702f4194617b0b759d89358cad8dd3c01e46042f..b791c1cfbe991fcee02c5617ff123b7b8cbadb46 100644 --- a/spec/controllers/conversations_controller_spec.rb +++ b/spec/controllers/conversations_controller_spec.rb @@ -154,12 +154,10 @@ describe ConversationsController do end it 'succeeds with json' do - Timecop.freeze do - get :show, :id => @conversation.id, :format => :json - response.should be_success - assigns[:conversation].should == @conversation - response.body.should == @conversation.to_json - end + get :show, :id => @conversation.id, :format => :json + response.should be_success + assigns[:conversation].should == @conversation + response.body.should == @conversation.to_json end it 'redirects to index' do