aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers/user_controller_spec.rb
diff options
context:
space:
mode:
authorFrancis Irving <francis@mysociety.org>2010-07-14 15:58:21 +0100
committerFrancis Irving <francis@mysociety.org>2010-07-14 15:58:21 +0100
commitf4164cd4099edcc7c7ad947ce128544d42027498 (patch)
tree4d009b7570e725fa1d282ee441bdc7ec8abcba1b /spec/controllers/user_controller_spec.rb
parent9c3f48ac7fde4e8e41c443a0d0fe8c8da15459a2 (diff)
Change test to work with new action name
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
-rw-r--r--spec/controllers/user_controller_spec.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb
index ff6ce2b56..c102f0f90 100644
--- a/spec/controllers/user_controller_spec.rb
+++ b/spec/controllers/user_controller_spec.rb
@@ -468,14 +468,14 @@ describe UserController, "when using profile photos" do
end
it "should not let you change profile photo if you're not logged in as the user" do
- post :profile_photo, { :id => @user.id, :file => @uploadedfile, :submitted_profile_photo => 1 }
+ post :set_profile_photo, { :id => @user.id, :file => @uploadedfile, :submitted_profile_photo => 1 }
end
it "should let you change profile photo if you're logged in as the user" do
@user.profile_photo.should be_nil
session[:user_id] = @user.id
- post :profile_photo, { :id => @user.id, :file => @uploadedfile, :submitted_profile_photo => 1 }
+ post :set_profile_photo, { :id => @user.id, :file => @uploadedfile, :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/)
@@ -488,11 +488,11 @@ describe UserController, "when using profile photos" do
@user.profile_photo.should be_nil
session[:user_id] = @user.id
- post :profile_photo, { :id => @user.id, :file => @uploadedfile, :submitted_profile_photo => 1 }
+ post :set_profile_photo, { :id => @user.id, :file => @uploadedfile, :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/)
- post :profile_photo, { :id => @user.id, :file => @uploadedfile_2, :submitted_profile_photo => 1 }
+ post :set_profile_photo, { :id => @user.id, :file => @uploadedfile_2, :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/)