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

features/manages_contact_requests.feature

@@ -6,10 +6,10 @@ Feature: managing contact requests
     And I have one contact request
     
   Scenario: seeing contact requests
-     When I am on the home page
-     Then I should see "Manage (1)" in the header
+    When I am on the home page
+    Then I should see "Manage (1)" in the header
 
-  @javascript @wip
+  @javascript
   Scenario: accepting a contact request
     When I am on the home page
     And I follow "Manage (1)"

features/step_definitions/custom_web_steps.rb

@@ -27,6 +27,5 @@ When /^I wait for the aspects page to load$/ do
 end
 
 When /^I wait for the ajax to finish$/ do
-  pending
-  # wait_until { ??? }
+  wait_until { evaluate_script("$.active") == 0 }
 end