0
@@ -59,9 +59,13 @@
0
           create(:person => person, :contact => contact, :status => PENDING)
0
           create(:person => contact, :contact => person, :status => REQUESTED)
0
         end
0
-        connection = conn(person, contact)
0
-        PersonMailer.deliver_connection_request(connection) if send_mail
0
-        connection
0
+        if send_mail
0
+          # The order here is important: the mail is sent *to* the contact,
0
+          # so the connection should be from the contact's point of view.
0
+          connection = conn(contact, person)
0
+          PersonMailer.deliver_connection_request(connection)
0
+        end
0
+        true
0
       end
0
     end
0
   

0
@@ -49,10 +49,11 @@
0
    describe "connection request" do
0
      
0
      before(:each) do
0
-       @connection = Connection.request(people(:quentin), people(:aaron))
0
+       @person  = people(:quentin)
0
+       @contact = people(:aaron)
0
+       Connection.request(@person, @contact)
0
+       @connection = Connection.conn(@contact, @person)
0
        @email = PersonMailer.create_connection_request(@connection)
0
-       @person = @connection.person
0
-       @contact = @connection.contact
0
      end
0
      
0
      it "should have the right recipient" do