From 67e4f9e159d7f70f97ca529911dc6df312456e55 Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Sat, 3 Mar 2012 16:25:10 -0800
Subject: [PATCH] remove puts and fix a conversationscontroller spec to be a
bit more predictable
---
spec/controllers/aspects_controller_spec.rb | 2 --
spec/controllers/conversations_controller_spec.rb | 3 ++-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/spec/controllers/aspects_controller_spec.rb b/spec/controllers/aspects_controller_spec.rb
index 6b0a7928ab..71725617b3 100644
--- a/spec/controllers/aspects_controller_spec.rb
+++ b/spec/controllers/aspects_controller_spec.rb
@@ -108,8 +108,6 @@ describe AspectsController do
it "should return the name and id of the updated item" do
params = {"name" => "Bruisers"}
put('update', :id => @alices_aspect_1.id, "aspect" => params)
-
- puts( response.inspect )
response.body.should == { :id => @alices_aspect_1.id, :name => "Bruisers" }.to_json
end
end
diff --git a/spec/controllers/conversations_controller_spec.rb b/spec/controllers/conversations_controller_spec.rb
index a849586720..b791c1cfbe 100644
--- a/spec/controllers/conversations_controller_spec.rb
+++ b/spec/controllers/conversations_controller_spec.rb
@@ -53,7 +53,8 @@ describe ConversationsController do
it 'succeeds with json' do
get :index, :format => :json
response.should be_success
- response.body.should =~ @conversations.to_json
+ json = JSON.parse(response.body)
+ json.first['conversation'].should be_present
end
it 'retrieves all conversations for a user' do
--
GitLab