RS, IZ; Socket spec now more realistic, visible_person_by_id fixed

app/models/user.rb

@@ -250,6 +250,7 @@ class User
     return self.person if id == self.person.id
     result = friends.detect{|x| x.id == id }
     result = visible_people.detect{|x| x.id == id } unless result
+    result
   end
 
   def group_by_id( id )
@@ -272,7 +273,7 @@ class User
   end
 
   def setup_person
-    self.person.serialized_key ||= generate_key.export
+    self.person.serialized_key ||= User.generate_key.export
     self.person.email ||= email
     self.person.save!
   end
@@ -281,9 +282,6 @@ class User
     self.groups.all.collect{|x| x.id}
   end
   protected
-   def generate_key
-    OpenSSL::PKey::RSA::generate 1024 
-  end 
 
   def self.generate_key
     OpenSSL::PKey::RSA::generate 1024 

spec/controllers/groups_controller_spec.rb

@@ -6,7 +6,7 @@ describe GroupsController do
     @user = Factory.create(:user)
     @user.group(:name => "lame-os")
     @person = Factory.create(:person)
-    request.env['warden'] = mock_model(Warden, :authenticate? => @user, :authenticate! => @user, :authenticate => @user)
+    sign_in :user, @user   
   end
 
   it "on index sets a variable containing all a user's friends when a user is signed in" do

spec/controllers/people_controller_spec.rb

@@ -4,7 +4,6 @@ describe PeopleController do
   render_views
   before do
     @user = Factory.create(:user)
-    request.env['warden'] = mock_model(Warden, :authenticate? => @user, :authenticate! => @user, :authenticate => @user)
 
     sign_in :user, @user   
     @user.group(:name => "lame-os")

spec/controllers/publics_controller_spec.rb

@@ -6,7 +6,7 @@ describe PublicsController do
   before do
     @user = Factory.create(:user)
     @user.person.save
-    request.env['warden'] = mock_model(Warden, :authenticate? => @user, :authenticate! => @user, :authenticate => @user)
+    sign_in :user, @user   
   end
 
   describe 'receive endpoint' do

spec/controllers/sockets_controller_spec.rb

@@ -6,15 +6,11 @@ class SocketsController
   end
 end
 
-describe 'SocketsController' do
+describe SocketsController do
   render_views  
   before do
     @user = Factory.create(:user)
-    SocketsController.unstub!(:new)
     @controller = SocketsController.new
-    @controller.request = mock_model(Request, :env =>
-      {'warden' => mock_model(Warden, :authenticate? => @user, :authenticate! => @user, :authenticate => @user)})
-    stub_sockets_controller
   end
 
   it 'should unstub the websockets' do

spec/spec_helper.rb

@@ -21,24 +21,22 @@ RSpec.configure do |config|
   config.before(:suite) do
     DatabaseCleaner.clean_with(:truncation)
     stub_signature_verification
+
   end
 
   config.before(:each) do
     DatabaseCleaner.start
-    stub_sockets_controller
+    stub_sockets
   end
 
   config.after(:each) do
     DatabaseCleaner.clean
   end
 end
-  def stub_sockets_controller
-    mock_sockets_controller = mock('sockets mock')
-    mock_sockets_controller.stub!(:incoming).and_return(true)
-    mock_sockets_controller.stub!(:new_subscriber).and_return(true)
-    mock_sockets_controller.stub!(:outgoing).and_return(true)
-    mock_sockets_controller.stub!(:delete_subscriber).and_return(true)
-    SocketsController.stub!(:new).and_return(mock_sockets_controller)
+  def stub_sockets
+    Diaspora::WebSocket.stub!(:push_to_user).and_return(true)
+    Diaspora::WebSocket.stub!(:subscribe).and_return(true)
+    Diaspora::WebSocket.stub!(:unsubscribe).and_return(true)
   end
 
   def stub_signature_verification