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

app/controllers/people_controller.rb

@@ -56,6 +56,7 @@ class PeopleController < ApplicationController
     end
 
     # upload and set new profile photo
+    params[:person][:profile] ||= {}
     if params[:person][:profile][:image].present?
       raw_image = params[:person][:profile].delete(:image)
       params[:profile_image_hash] = { :user_file => raw_image, :to => "all" }

app/mailers/notifier.rb

@@ -2,12 +2,12 @@ class Notifier < ActionMailer::Base
   include Magent::Async
   
   default :from => "no-reply@joindiaspora.com"
-  ATTACHMENT =  File.read("#{Rails.root}/public/images/diaspora_caps.png")  
+  ATTACHMENT =  File.read("#{Rails.root}/public/images/diaspora_white_on_grey.png")  
 
   def new_request(recipient, sender)
     @receiver = recipient
     @sender = sender
-    attachments["diaspora_white.png"] = ATTACHMENT 
+    attachments["diaspora_white_on_grey.png"] = ATTACHMENT 
 
     mail(:to => "#{recipient.real_name} <#{recipient.email}>",
     :subject => "new Diaspora* friend request from #{@sender.real_name}", :host => APP_CONFIG[:terse_pod_url])

app/views/notifier/new_request.html.haml

@@ -43,7 +43,7 @@
       }
   %body
     %header
-      = image_tag 'diaspora_white.png'
+      = image_tag attachments['diaspora_white_on_grey.png'], :alt => "DIASPORA"
     #container
       %p
         Hello #{@receiver.profile.first_name}!

app/views/notifier/request_accepted.html.haml

@@ -43,7 +43,7 @@
       }
   %body
     %header
-      = image_tag 'diaspora_white.png'
+      = image_tag attachments['diaspora_white_on_grey.png'], :alt => "DIASPORA"
     #container
       %p
         Hello #{@receiver.profile.first_name}!

spec/controllers/people_controller_spec.rb

@@ -22,14 +22,17 @@ describe PeopleController do
 
   it 'should go to the current_user show page' do
     get :show, :id => user.person.id
+    response.should be_success
   end
 
-  it "doesn't error out on an invalid id" do
+  it "redirects on an invalid id" do
     get :show, :id => 'delicious'
+    response.should redirect_to people_path
   end
 
-  it "doesn't error out on a nonexistent person" do
+  it "redirects on a nonexistent person" do
     get :show, :id => user.id
+    response.should redirect_to people_path
   end
 
   describe '#update' do
@@ -50,5 +53,11 @@ describe PeopleController do
         user.person.profile.image_url.should == image_url
       end
     end
+    it 'does not allow mass assignment' do
+      new_user = make_user
+      put :update, :id => user.person.id, :person => {
+        :owner_id => new_user.id}
+      user.person.reload.owner_id.should_not == new_user.id
+    end
   end
 end