Merge branch 'cucumber_fixes' of https://github.com/dangold1138/diaspora

features/manages_contact_requests.feature

@@ -13,13 +13,13 @@ Feature: managing contact requests
     Then I should see "new request!"
     
   @javascript
-  Scenario: viewing a request's profile
+  Scenario: viewing a requests profile
     When I am on the aspects manage page
     Then I should see "1" within "#notification_badge"
     When I click on the contact request
-    And I wait for the request's profile page to load
-    Then I should be on the requestor's profile page
-    And I should see "You have an incoming request from this person"
+    And I wait for the requestors profile page to load
+    Then I should be on the requestors profile
+    And I should see "wants to share with you"
 
   @javascript
   Scenario: accepting a contact request

features/notifications.feature

@@ -0,0 +1,11 @@
+@javascript
+Feature: Notifications
+  In order to see what is happening
+  As a User
+  I want to get notifications
+
+Scenario: someone offers to share with me
+  Given I am signed in
+  And I have one contact request
+  And I follow "notifications" in the header
+  Then I should see "offered to share with you"

features/step_definitions/custom_web_steps.rb

@@ -51,7 +51,7 @@ When /^I wait for the aspects page to load$/ do
   wait_until { current_path == aspects_path }
 end
 
-When /^I wait for the request's profile page to load$/ do
+When /^I wait for the requestors profile page to load$/ do
   wait_until { current_path == person_path(Request.where(:recipient_id => @me.person.id).first.sender) }
 end
 

features/support/paths.rb

@@ -11,7 +11,7 @@ module NavigationHelpers
       edit_person_path(@me.person)
     when /^my acceptance form page$/
       accept_user_invitation_path(:invitation_token => @me.invitation_token)
-    when /^the requestor's profile page$/
+    when /^the requestors profile$/
       person_path(Request.where(:recipient_id => @me.person.id).first.sender)
     when /^"([^\"]*)"'s page$/
       person_path(User.find_by_email($1).person)