Get picture posting to work

1 files changed, 7 insertions, 3 deletions

diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb
index cdd911ec7..19225c6ae 100644
--- a/spec/controllers/user_controller_spec.rb
+++ b/spec/controllers/user_controller_spec.rb
@@ -460,7 +460,7 @@ describe UserController, "when using profile photos" do
     it "should not let you change profile photo if you're not logged in as the user" do
         user = users(:bob_smith_user)
         data = load_file_fixture("parrot.png")
-        post :profile_photo, { :id => user.id, :data => data } 
+        post :profile_photo, { :id => user.id, :file => data } 
     end
 
     it "should let you change profile photo if you're logged in as the user" do
@@ -468,10 +468,14 @@ describe UserController, "when using profile photos" do
         user.profile_photo.should be_nil
 
         session[:user_id] = user.id
-        data = load_file_fixture("parrot.png")
-        post :profile_photo, { :id => user.id, :data => data } 
+        tempfile = File.open(file_fixture_name("parrot.png"))
+        tempfile.stub!(:original_filename).and_return('parrot.png')
+        post :profile_photo, { :id => user.id, :file => tempfile, :submitted_profile_photo => 1 } 
 
         response.should redirect_to(:controller => 'user', :action => 'show', :url_name => "bob_smith")
+        flash[:notice].should match(/Thank you for updating your profile photo/) 
+
+        user.reload
         user.profile_photo.should_not be_nil
     end
 end