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

This commit is contained in:
maxwell 2010-12-15 19:15:26 -08:00
commit 226d95ec2c

View file

@ -147,17 +147,19 @@ describe AspectsController do
end end
describe "#move_contact" do describe "#move_contact" do
let(:opts) { { before do
:person_id => "person_id", @person = Factory.create(:person)
:from => "from_aspect_id", @opts = {
:to => :person_id => @person.id,
{:to => "to_aspect_id"} :from => @aspect.id,
} } :to =>
{:to => @aspect1.id}
}
end
it 'calls the move_contact_method' do it 'calls the move_contact_method' do
pending "need to figure out what is the deal with remote requests"
@controller.stub!(:current_user).and_return(@user) @controller.stub!(:current_user).and_return(@user)
@user.should_receive(:move_contact).with(:person_id => "person_id", :from => "from_aspect_id", :to => "to_aspect_id") @user.should_receive(:move_contact)
post :move_contact, opts post :move_contact, @opts
end end
end end