From 39c7478b4a833a0cce66a5d37c3912d2aafc97dc Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Sat, 17 Mar 2012 19:21:24 -0700
Subject: [PATCH] Revert "freeze time in conversations show spec to make ree
travis happy" as it did not work :/
This reverts commit d668b21cd478f1ca48a550d8dc0cd6aa96572cae.
---
spec/controllers/conversations_controller_spec.rb | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/spec/controllers/conversations_controller_spec.rb b/spec/controllers/conversations_controller_spec.rb
index 702f419461..b791c1cfbe 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
--
GitLab