From 16e8ecc72c0cae4a095d001f35fc6904b3adcb6c Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Tue, 22 Feb 2011 22:38:23 -0800
Subject: [PATCH] fixing debugging statement in smcontroller, also fix the spec
---
app/controllers/status_messages_controller.rb | 2 +-
spec/controllers/status_messages_controller_spec.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
index 3a92456371..f21bad4694 100644
--- a/app/controllers/status_messages_controller.rb
+++ b/app/controllers/status_messages_controller.rb
@@ -18,7 +18,7 @@ class StatusMessagesController < ApplicationController
public_flag.to_s.match(/(true)|(on)/) ? public_flag = true : public_flag = false
params[:status_message][:public] = public_flag
- @status_message = current_user.build_post(:status_message, params[:status_message].merge!(:message => ''))
+ @status_message = current_user.build_post(:status_message, params[:status_message])
aspects = current_user.aspects_from_ids(params[:aspect_ids])
if @status_message.save
diff --git a/spec/controllers/status_messages_controller_spec.rb b/spec/controllers/status_messages_controller_spec.rb
index 49caa02ec3..bb7d5c315c 100644
--- a/spec/controllers/status_messages_controller_spec.rb
+++ b/spec/controllers/status_messages_controller_spec.rb
@@ -86,7 +86,7 @@ describe StatusMessagesController do
end
it 'sends the errors in the body on js' do
post :create, status_message_hash.merge!(:format => 'js', :status_message => {:message => ''})
- response.body.should == 'Status message requires a message or at least one photo'
+ response.body.should include('Status message requires a message or at least one photo')
end
--
GitLab