Merge branch 'master' of github.com:diaspora/diaspora

app/models/person.rb

@@ -85,7 +85,7 @@ class Person
        local_person
      elsif  !identifier.include?("localhost") && !opts[:local]
        begin
-         puts "begin finger"
+        Rails.logger.info("Webfingering #{identifier}")
         f = Redfinger.finger(identifier)
        rescue SocketError => e
          raise "Diaspora server for #{identifier} not found" if e.message =~ /Name or service not known/

script/websocket_server.rb

@@ -35,6 +35,7 @@ end
         ws.onclose { Diaspora::WebSocket.unsubscribe(ws.request['Path'].gsub('/',''), sid) }
       }
     end
+    puts "Websocket server started."
     process_message
   }
 

spec/lib/websocket_spec.rb

@@ -17,8 +17,9 @@ describe Diaspora::WebSocket do
   end
 
   it 'The queued job should reach Magent' do
-    Magent.should_receive(:push)
     @post.socket_to_uid(@user.id, :aspect_ids => @aspect.id)
+    channel = Magent::GenericChannel.new('websocket')
+    channel.message_count.should == 1
   end
 
 end