diff --git a/app/controllers/aspect_memberships_controller.rb b/app/controllers/aspect_memberships_controller.rb index 66cb7917d..56ba76dba 100644 --- a/app/controllers/aspect_memberships_controller.rb +++ b/app/controllers/aspect_memberships_controller.rb @@ -67,7 +67,7 @@ class AspectMembershipsController < ApplicationController def update @person = Person.find(params[:person_id]) - @from_aspect = current_user.aspects.where(:id => params[:id]).first + @from_aspect = current_user.aspects.where(:id => params[:aspect_id]).first @to_aspect = current_user.aspects.where(:id => params[:to]).first response_hash = { } diff --git a/spec/controllers/aspect_memberships_controller_spec.rb b/spec/controllers/aspect_memberships_controller_spec.rb index b3bfe7681..828eb9c44 100644 --- a/spec/controllers/aspect_memberships_controller_spec.rb +++ b/spec/controllers/aspect_memberships_controller_spec.rb @@ -41,7 +41,7 @@ describe AspectMembershipsController do delete :destroy, :format => 'js', :id => 123, :person_id => @user2.person.id, - :id => @aspect0.id + :aspect_id => @aspect0.id response.should be_success @aspect0.reload @aspect0.contacts.include?(@contact).should be false @@ -51,8 +51,9 @@ describe AspectMembershipsController do it 'calls the move_contact method' do @controller.stub!(:current_user).and_return(@user) @user.should_receive(:move_contact) - put :update, :person_id => @user.person.id, - :id => @aspect0.id, + put :update, :id => 123, + :person_id => @user.person.id, + :aspect_id => @aspect0.id, :to => @aspect1.id end end @@ -81,7 +82,7 @@ describe AspectMembershipsController do delete :destroy, :format => 'js', :id => 123, :person_id => @user2.person.id, - :id => @aspect0.id + :aspect_id => @aspect0.id response.should_not be_success response.body.should include "Cannot remove person from last aspect" end