Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanielvincent <danielgrippi@gmail.com>2010-10-30 06:13:09 +0400
committermaxwell <maxwell@joindiaspora.com>2010-11-02 00:54:40 +0300
commitf6b4be97a3801b9975f4838ad40471e6db6eb5f3 (patch)
tree5ef0185d9608c4598ceffbc23225c296695666e9 /spec/helper_methods.rb
parent1acc206fa47afd17018d0af0a136b2c367e8c854 (diff)
requests are almost there
Diffstat (limited to 'spec/helper_methods.rb')
-rw-r--r--spec/helper_methods.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/spec/helper_methods.rb b/spec/helper_methods.rb
index e60b39535..4dc1ca8f2 100644
--- a/spec/helper_methods.rb
+++ b/spec/helper_methods.rb
@@ -28,9 +28,12 @@ module HelperMethods
def friend_users(user1, aspect1, user2, aspect2)
request = user1.send_friend_request_to(user2.person, aspect1)
- user2.receive_friend_request(request)
+
+ user2.receive request.to_diaspora_xml, user1.person
+
reversed_request = user2.accept_friend_request( request.id, aspect2.id)
user1.reload
+
user1.receive reversed_request.to_diaspora_xml, user2.person
user1.reload
aspect1.reload