From 8d986a207e285af9a2cad3c11aee756c336d5e89 Mon Sep 17 00:00:00 2001 From: maxwell Date: Tue, 10 Aug 2010 17:50:17 -0700 Subject: [PATCH] IZ MS; Socket test now passes --- lib/diaspora/parser.rb | 1 - spec/controllers/sockets_controller_spec.rb | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/diaspora/parser.rb b/lib/diaspora/parser.rb index c5fdf3ccb..9636bbe22 100644 --- a/lib/diaspora/parser.rb +++ b/lib/diaspora/parser.rb @@ -70,7 +70,6 @@ module Diaspora elsif p.is_a? Profile p.save - elsif p.respond_to?(:person) && !(p.person.nil?) && !(p.person.is_a? User) Rails.logger.debug("Saving object with success: #{p.save}") end diff --git a/spec/controllers/sockets_controller_spec.rb b/spec/controllers/sockets_controller_spec.rb index 84188be25..19673cb24 100644 --- a/spec/controllers/sockets_controller_spec.rb +++ b/spec/controllers/sockets_controller_spec.rb @@ -23,6 +23,12 @@ describe 'SocketsController' do end it 'should actionhash posts' do + class SocketsController + def url_options + {:host => ""} + end + end + json = @controller.action_hash(@user.id, @message) json.include?(@message.message).should be_true json.include?('status_message').should be_true