Moving to make_user, a few specs broken

spec/controllers/albums_controller_spec.rb

@@ -7,7 +7,7 @@ require 'spec_helper'
 describe AlbumsController do
  render_views
   before do
-    @user = Factory.create(:user)
+    @user = make_user
     @aspect = @user.aspect(:name => "lame-os")
     @album = @user.post :album, :to => @aspect.id, :name => 'things on fire'
     sign_in :user, @user
@@ -31,7 +31,7 @@ describe AlbumsController do
     end
     
     it "doesn't overwrite random attributes" do
-      new_user = Factory.create :user
+      new_user = make_user
       params = {:name => "Bruisers", :person_id => new_user.person.id}
       put('update', :id => @album.id, "album" => params)
       @album.reload.person_id.should == @user.person.id

spec/controllers/aspects_controller_spec.rb

@@ -8,10 +8,10 @@ describe AspectsController do
   render_views
 
   before do
-    @user    = Factory.create(:user)
+    @user    = make_user
     @aspect  = @user.aspect(:name => "lame-os")
     @aspect1 = @user.aspect(:name => "another aspect")
-    @user2   = Factory.create(:user)
+    @user2   = make_user
     @aspect2 = @user2.aspect(:name => "party people")
     friend_users(@user,@aspect, @user2, @aspect2)
     @contact = @user.contact_for(@user2.person)

spec/controllers/photos_controller_spec.rb

@@ -7,7 +7,7 @@ require 'spec_helper'
 describe PhotosController do
   render_views
   before do
-    @user = Factory.create(:user)
+    @user = make_user
     @aspect = @user.aspect(:name => "lame-os")
     @album = @user.post :album, :to => @aspect.id, :name => 'things on fire'
     @fixture_filename = 'button.png'

spec/controllers/publics_controller_spec.rb

@@ -7,8 +7,8 @@ require 'spec_helper'
 
 describe PublicsController do
   render_views
-  let!(:user) { Factory.create :user }
-  let!(:user2) { Factory.create :user }
+  let!(:user) { make_user }
+  let!(:user2) { make_user }
   let!(:aspect1) { user.aspect(:name => "foo") }
   let!(:aspect2) { user2.aspect(:name => "far") }
   let!(:aspect2) { user2.aspect(:name => 'disciples') }
@@ -101,7 +101,7 @@ describe PublicsController do
 
   describe '#webfinger' do
     it "succeeds when the person and user exist locally" do
-      user = Factory(:user)
+      user = make_user
       post :webfinger, 'q' => user.person.diaspora_handle
       response.should be_success
     end

spec/controllers/requests_controller_spec.rb

@@ -7,7 +7,7 @@ require 'spec_helper'
 describe RequestsController do
   render_views
   before do
-    @user = Factory.create(:user)
+    @user = make_user
 
     sign_in :user, @user
     @user.aspect(:name => "lame-os")

spec/controllers/services_controller_spec.rb

@@ -6,7 +6,7 @@ require 'spec_helper'
 
 describe ServicesController do
   render_views
-  let(:user) { Factory(:user) }
+  let(:user) { make_user }
   let!(:aspect) { user.aspect(:name => "lame-os") }
 
   let!(:service1) {a = Factory(:service); user.services << a; a}

spec/controllers/sockets_controller_spec.rb

@@ -13,7 +13,7 @@ EOT
 describe SocketsController do
   render_views
   before do
-    @user = Factory.create(:user)
+    @user = make_user
     @controller = SocketsController.new
   end
 

spec/controllers/status_message_controller_spec.rb

@@ -7,7 +7,7 @@ require 'spec_helper'
 describe StatusMessagesController do
   render_views
 
-  let!(:user) { Factory(:user) }
+  let!(:user) { make_user }
   let!(:aspect) { user.aspect(:name => "lame-os") }
 
   before do

spec/controllers/users_controller_spec.rb

@@ -6,7 +6,7 @@ require 'spec_helper'
 
 describe UsersController do
 
-  let(:user) { Factory(:user) }
+  let(:user) { make_user }
   let!(:aspect) { user.aspect(:name => "lame-os") }
 
   let!(:old_password) { user.encrypted_password }

spec/helper_methods.rb

@@ -1,15 +1,4 @@
 module HelperMethods
-  def stub_sockets
-    Diaspora::WebSocket.stub!(:queue_to_user).and_return(true)
-    Diaspora::WebSocket.stub!(:subscribe).and_return(true)
-    Diaspora::WebSocket.stub!(:unsubscribe).and_return(true)
-  end
-
-  def unstub_sockets
-    Diaspora::WebSocket.unstub!(:queue_to_user)
-    Diaspora::WebSocket.unstub!(:subscribe)
-    Diaspora::WebSocket.unstub!(:unsubscribe)
-  end
 
   def stub_comment_signature_verification
     Comment.any_instance.stubs(:verify_signature).returns(true)

spec/helpers/application_helper_spec.rb

@@ -6,7 +6,7 @@ require 'spec_helper'
 
 describe ApplicationHelper do
   before do
-    @user = Factory.create(:user)
+    @user = make_user
     @person = Factory.create(:person)
   end
 

spec/helpers/publics_helper_spec.rb

@@ -6,7 +6,7 @@ require 'spec_helper'
 
 describe PublicsHelper do
   before do
-    @user = Factory.create(:user)
+    @user = make_user
     @person = Factory.create(:person)
   end
 

spec/lib/diaspora/exporter_spec.rb

@@ -7,9 +7,9 @@ require File.join(Rails.root, 'lib/diaspora/exporter')
 
 describe Diaspora::Exporter do
 
-  let!(:user1) { Factory(:user) }
-  let!(:user2) { Factory(:user) }
-  let!(:user3) { Factory(:user) }
+  let!(:user1) { make_user }
+  let!(:user2) { make_user }
+  let!(:user3) { make_user }
 
   let!(:aspect) { user1.aspect(:name => "Old Work")   }
   let(:aspect1) { user1.aspect(:name => "Work")   }

spec/lib/diaspora/importer_spec.rb

@@ -10,11 +10,11 @@ describe Diaspora::Importer do
 
   before(:each) do
     # Five users on pod
-    @user1 = Factory(:user)
-    @user2 = Factory(:user)
-    @user3 = Factory(:user)
-    @user4 = Factory(:user)
-    @user5 = Factory(:user)
+    @user1 = make_user
+    @user2 = make_user
+    @user3 = make_user
+    @user4 = make_user
+    @user5 = make_user
 
     # Two external people referenced on pod
     @person1 = Factory(:person)

spec/lib/diaspora/ostatus_builder.rb

@@ -8,7 +8,7 @@ require File.join(Rails.root,  'lib/diaspora/ostatus_builder')
 
 describe Diaspora::OstatusBuilder do
 
-  let!(:user) { Factory(:user) }
+  let!(:user) { make_user }
   let(:aspect) { user.aspect(:name => "Public People") }
   let!(:status_message1) { user.post(:status_message, :message => "One", :public => true, :to => aspect.id) }
   let!(:status_message2) { user.post(:status_message, :message => "Two", :public => true, :to => aspect.id) }

spec/lib/diaspora/parser_spec.rb

@@ -5,11 +5,11 @@
 require 'spec_helper'
 
 describe Diaspora::Parser do
-  let(:user) { Factory.create(:user) }
+  let(:user) { make_user }
   let(:aspect) { user.aspect(:name => 'spies') }
-  let(:user2) { Factory.create(:user) }
+  let(:user2) { make_user }
   let(:aspect2) { user2.aspect(:name => "pandas") }
-  let(:user3) { Factory.create :user }
+  let(:user3) { make_user }
   let(:person) { user3.person }
 
   describe "parsing compliant XML object" do

spec/lib/em-webfinger_spec.rb

@@ -7,8 +7,8 @@ require 'spec_helper'
 require File.join(Rails.root, 'lib/em-webfinger')
 
 describe EMWebfinger do
-  let(:user1) { Factory(:user) }
-  let(:user2) { Factory(:user) }
+  let(:user1) { make_user }
+  let(:user2) { make_user }
 
   let(:account) {"foo@tom.joindiaspora.com"}
   let(:person){ Factory(:person, :diaspora_handle => account)}

spec/lib/encryptor_spec.rb

@@ -6,7 +6,7 @@ require 'spec_helper'
 
 describe 'user encryption' do
   before do
-    @user = Factory.create(:user)
+    @user = make_user
     @aspect = @user.aspect(:name => 'dudes')
   end
 

spec/lib/message_handler_spec.rb

@@ -9,7 +9,6 @@ describe MessageHandler do
        unstub_mocha_stubs
     end
     after  do
-      stub_sockets
       MessageHandler.any_instance.stubs(:add_post_request)
     end
 

spec/lib/salmon_salmon_spec.rb

@@ -5,9 +5,9 @@
 require 'spec_helper'
 
 describe Salmon do
-  let(:user){Factory.create :user}
-  let(:user2) {Factory.create :user}
-  let(:user3) {Factory.create :user}
+  let(:user){make_user}
+  let(:user2) {make_user}
+  let(:user3) {make_user}
   let(:post){ user.post :status_message, :message => "hi", :to => user.aspect(:name => "sdg").id }
 
   let!(:created_salmon) {Salmon::SalmonSlap.create(user, post.to_diaspora_xml)}

spec/lib/verify_spec.rb

@@ -7,9 +7,9 @@ require File.join(Rails.root, 'lib/diaspora/importer')
 
 describe Diaspora::Importer do
 
-  let!(:user1) { Factory(:user) }
-  let!(:user2) { Factory(:user) }
-  let!(:user3) { Factory(:user) }
+  let!(:user1) { make_user }
+  let!(:user2) { make_user }
+  let!(:user3) { make_user }
 
   let(:aspect1) { user1.aspect(:name => "Work")   }
   let(:aspect2) { user2.aspect(:name => "Family") }
@@ -24,7 +24,7 @@ describe Diaspora::Importer do
   context 'serialized user' do
     describe '#verify_user' do
       it 'should return true for a new valid user' do
-        new_user = Factory(:user)
+        new_user = make_user
         new_user.delete
         importer.verify_user(new_user).should be true
       end

spec/lib/websocket_spec.rb

@@ -6,10 +6,9 @@ require 'spec_helper'
 
 describe Diaspora::WebSocket do
   before do
-    @user = Factory.create(:user)
+    @user = make_user
     @aspect = @user.aspect(:name => "losers")
     @post = @user.build_post(:status_message, :message => "hey", :to => @aspect.id)
-    unstub_sockets
   end
 
   it 'should queue a job' do

spec/mailers/notifier_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe Notifier do
 
-  let!(:user) {Factory.create :user}
+  let!(:user) {make_user}
   let!(:aspect) {user.aspect(:name => "science")}
   let!(:person) {Factory.create :person}
   let!(:request_mail) {Notifier.new_request(user, person)}

spec/misc_spec.rb

@@ -6,7 +6,7 @@ require 'spec_helper'
 
 describe 'making sure the spec runner works' do
   it 'should factory create a user with a person saved' do
-    user = Factory.create(:user)
+    user = make_user
     loaded_user = User.first(:id => user.id)
     loaded_user.person.owner_id.should == user.id
   end

spec/models/album_spec.rb

@@ -5,7 +5,7 @@
 require 'spec_helper'
 
 describe Album do
-  let(:user) { Factory.create(:user) }
+  let(:user) { make_user }
   let(:person) { user.person }
   let(:aspect) { user.aspect(:name => "Foo") }
   let(:album) { user.post(:album, :name => "test collection", :to => aspect.id) }

spec/models/aspect_spec.rb

@@ -5,16 +5,16 @@
 require 'spec_helper'
 
 describe Aspect do
-  let(:user ) { Factory.create(:user) }
+  let(:user ) { make_user }
   let(:friend) { Factory.create(:person) }
-  let(:user2) { Factory.create(:user) }
+  let(:user2) { make_user }
   let(:friend_2) { Factory.create(:person) }
 
   let(:aspect) {user.aspect(:name => 'losers')}
   let(:aspect2) {user2.aspect(:name => 'failures')}
   let(:aspect1) {user.aspect(:name => 'cats')}
   let(:not_friend) { Factory(:person, :diaspora_handle => "not@person.com")}
-  let(:user3) {Factory(:user)}
+  let(:user3) {make_user}
   let(:aspect3) {user3.aspect(:name => "lala")}
 
   describe 'creation' do

spec/models/comment_spec.rb

@@ -5,10 +5,10 @@
 require 'spec_helper'
 
 describe Comment do
-  let(:user)    {Factory.create :user}
+  let(:user)    {make_user}
   let(:aspect)  {user.aspect(:name => "Doofuses")}
 
-  let(:user2)   {Factory.create(:user)}
+  let(:user2)   {make_user}
   let(:aspect2) {user2.aspect(:name => "Lame-faces")}
 
   it 'validates that the handle belongs to the person' do
@@ -114,7 +114,7 @@ describe Comment do
   end
   describe 'serialization' do
     it 'should serialize the handle and not the sender' do
-      commenter = Factory.create(:user)
+      commenter = make_user
       commenter_aspect = commenter.aspect :name => "bruisers"
       friend_users(user, aspect, commenter, commenter_aspect)
       post = user.post :status_message, :message => "hello", :to => aspect.id

spec/models/person_spec.rb

@@ -6,8 +6,8 @@ require 'spec_helper'
 
 describe Person do
   before do
-    @user = Factory.create(:user)
-    @user2 = Factory.create(:user)
+    @user = make_user
+    @user2 = make_user
     @person = Factory.create(:person)
     @aspect = @user.aspect(:name => "Dudes")
     @aspect2 = @user2.aspect(:name => "Abscence of Babes")
@@ -24,7 +24,8 @@ describe Person do
   describe '#diaspora_handle' do
     context 'local people' do
       it 'uses the pod config url to set the diaspora_handle' do
-        @user.person.diaspora_handle.should == @user.username + "@" + APP_CONFIG[:terse_pod_url]
+        new_user = Factory.create(:user)
+        new_user.person.diaspora_handle.should == new_user.username + "@" + APP_CONFIG[:terse_pod_url]
       end
     end
 
@@ -47,7 +48,7 @@ describe Person do
   end
 
   context '#real_name' do
-    let!(:user) { Factory(:user) }
+    let!(:user) { make_user }
     let!(:person) { user.person }
     let!(:profile) { person.profile }
 
@@ -176,7 +177,7 @@ describe Person do
   end
 
   context 'people finders for webfinger' do
-    let(:user) {Factory(:user)}
+    let(:user) {make_user}
     let(:person) {Factory(:person)}
 
     describe '.by_account_identifier' do

spec/models/photo_spec.rb

@@ -6,7 +6,7 @@ require 'spec_helper'
 
 describe Photo do
   before do
-    @user = Factory.create(:user)
+    @user = make_user
     @aspect = @user.aspect(:name => "losers")
     @album = @user.post :album, :name => "foo", :to => @aspect.id
 

spec/models/post_spec.rb

@@ -6,7 +6,7 @@ require 'spec_helper'
 
 describe Post do
   before do
-    @user = Factory.create(:user)
+    @user = make_user
   end
 
   describe 'xml' do

spec/models/request_spec.rb

@@ -5,8 +5,8 @@
 require 'spec_helper'
 
 describe Request do
-  let(:user) { Factory(:user) }
-  let(:user2) { Factory :user}
+  let(:user) { make_user }
+  let(:user2) { make_user}
   let(:person) {Factory :person}
   let(:aspect) { user.aspect(:name => "dudes") }
   let(:request){ user.send_friend_request_to user2.person, aspect }

spec/models/retraction_spec.rb

@@ -6,7 +6,7 @@ require 'spec_helper'
 
 describe Retraction do
 
-  let(:user) { Factory(:user) }
+  let(:user) { make_user }
   let(:person) { Factory(:person) }
   let(:aspect) { user.aspect(:name => "Bruisers") }
   let!(:activation) { user.activate_friend(person, aspect) }

spec/models/status_message_spec.rb

@@ -6,7 +6,7 @@ require 'spec_helper'
 
 describe StatusMessage do
   before do
-      @user = Factory.create(:user)
+      @user = make_user
       @aspect = @user.aspect(:name => "losers")
   end
 

spec/models/user/attack_vectors_spec.rb

@@ -6,15 +6,15 @@ require 'spec_helper'
 
 describe "attack vectors" do
 
-  let(:user) { Factory(:user) }
+  let(:user) { make_user }
   let(:aspect) { user.aspect(:name => 'heroes') }
   
-  let(:bad_user) { Factory(:user)}
+  let(:bad_user) { make_user}
 
-  let(:user2) { Factory(:user) }
+  let(:user2) { make_user }
   let(:aspect2) { user2.aspect(:name => 'losers') }
 
-  let(:user3) { Factory(:user) }
+  let(:user3) { make_user }
   let(:aspect3) { user3.aspect(:name => 'heroes') }
 
   before do

spec/models/user/invite_spec.rb

@@ -5,9 +5,9 @@
 require 'spec_helper'
 
 describe User do
-  let(:inviter)  {Factory.create :user}
+  let(:inviter)  {make_user}
   let(:aspect)   {inviter.aspect(:name => "awesome")}
-  let(:another_user) {Factory.create :user}
+  let(:another_user) {make_user}
   let(:wrong_aspect) {another_user.aspect(:name => "super")}
   let(:inviter_with_3_invites) {Factory.create :user, :invites => 3}
   let(:aspect2) {inviter_with_3_invites.aspect(:name => "Jersey Girls")}

spec/models/user/posting_spec.rb

@@ -6,8 +6,8 @@ require 'spec_helper'
 
 describe User do
 
-  let!(:user) { Factory(:user) }
-  let!(:user2) { Factory(:user) }
+  let!(:user) { make_user }
+  let!(:user2) { make_user }
 
   let!(:aspect) { user.aspect(:name => 'heroes') }
   let!(:aspect1) { user.aspect(:name => 'other') }
@@ -80,9 +80,9 @@ describe User do
   end
 
   context 'dispatching' do
-    let!(:user3) { Factory(:user) }
+    let!(:user3) { make_user }
     let!(:aspect3) { user3.aspect(:name => 'heroes') }
-    let!(:user4) { Factory(:user) }
+    let!(:user4) { make_user }
     let!(:aspect4) { user4.aspect(:name => 'heroes') }
 
     let!(:post) { user.build_post :status_message, :message => "hey" }

spec/models/user/querying_spec.rb

@@ -38,7 +38,7 @@ describe User do
       end
 
       context 'with two users' do
-        let!(:user)          {Factory :user}
+        let!(:user)          {make_user}
         let!(:first_aspect)  {user.aspect(:name => 'bruisers')}
         let!(:second_aspect) {user.aspect(:name => 'losers')}
 
@@ -58,7 +58,7 @@ describe User do
   end
 
   context 'with two users' do
-    let!(:user)          {Factory :user}
+    let!(:user)          {make_user}
     let!(:first_aspect)  {user.aspect(:name => 'bruisers')}
     let!(:second_aspect) {user.aspect(:name => 'losers')}
     let!(:user4) { Factory.create(:user_with_aspect)}

spec/models/user/receive_spec.rb

@@ -6,13 +6,13 @@ require 'spec_helper'
 
 describe User do
 
-  let(:user) { Factory(:user) }
+  let(:user) { make_user }
   let(:aspect) { user.aspect(:name => 'heroes') }
 
-  let(:user2) { Factory(:user) }
+  let(:user2) { make_user }
   let(:aspect2) { user2.aspect(:name => 'losers') }
 
-  let(:user3) { Factory(:user) }
+  let(:user3) { make_user }
   let(:aspect3) { user3.aspect(:name => 'heroes') }
 
   before do

spec/models/user/user_friending_spec.rb

@@ -6,7 +6,7 @@
 require 'spec_helper'
 
 describe Diaspora::UserModules::Friending do
-  let(:user) { Factory.create :user }
+  let(:user) { make_user }
   let(:aspect) { user.aspect(:name => 'heroes') }
   let(:aspect1) { user.aspect(:name => 'other') }
   let(:friend) { Factory.create(:person) }
@@ -15,7 +15,7 @@ describe Diaspora::UserModules::Friending do
   let(:person_two) { Factory.create :person }
   let(:person_three) { Factory.create :person }
 
-  let(:user2) { Factory.create :user }
+  let(:user2) { make_user }
   let(:aspect2) { user2.aspect(:name => "aspect two") }
 
   before do

spec/models/user_spec.rb

@@ -5,9 +5,9 @@
 require 'spec_helper'
 
 describe User do
-  let(:user) { Factory(:user) }
+  let(:user) { make_user }
   let(:aspect) { user.aspect(:name => 'heroes') }
-  let(:user2) { Factory(:user) }
+  let(:user2) { make_user }
   let(:aspect2) { user2.aspect(:name => 'stuff') }
 
   it 'should have a key' do

spec/spec_helper.rb

@@ -28,7 +28,6 @@ RSpec.configure do |config|
   DatabaseCleaner.orm = "mongo_mapper"
 
   config.before(:each) do
-    stub_sockets
     MessageHandler.any_instance.stubs(:add_post_request)
     DatabaseCleaner.clean
     UserFixer.load_user_fixtures