various bugfixes, added missing translations, made all tests pass (rspec, cucumber, jasmine)

5 files changed, 14 insertions, 12 deletions

diff --git a/features/comments.feature b/features/comments.feature
index 49713a4da..a414be3f4 100644
--- a/features/comments.feature
+++ b/features/comments.feature
@@ -15,7 +15,7 @@ Feature: commenting
     And I fill in "status_message_fake_text" with "Look at this dog"
     And I press "Share"
     And I wait for the ajax to finish
-    And I follow "My Contacts"
+    And I follow "Your Aspects"
     Then I should see "Look at this dog" within ".stream_element"
     And I should see a "img" within ".stream_element div.photo_attachments"
     Then I log out
diff --git a/features/connects_users.feature b/features/connects_users.feature
index 812343e66..548832dd6 100644
--- a/features/connects_users.feature
+++ b/features/connects_users.feature
@@ -48,7 +48,7 @@ Feature: sending and receiving requests
     And I add the person to my 2nd aspect
 
     When I go to the home page
-    When I follow "My Contacts"
+    When I follow "Your Aspects"
 
     Then I should have 1 contact in "Unicorns"
     Then I should have 1 contact in "Besties"
@@ -60,7 +60,7 @@ Feature: sending and receiving requests
     Then I go to the destroy user session page
 
     When I sign in as "bob@bob.bob"
-    When I follow "My Contacts"
+    When I follow "Your Aspects"
       Then I should have 1 contacts in "Besties"
 
     And I am on the home page
@@ -79,12 +79,12 @@ Feature: sending and receiving requests
     And I wait for the ajax to finish
 
    When I go to the home page
-    When I follow "My Contacts"
+   When I follow "Your Aspects"
    Then I should have 1 contact in "Super People"
    Then I go to the destroy user session page
 
    When I sign in as "bob@bob.bob"
-    When I follow "My Contacts"
+   When I follow "Your Aspects"
    Then I should have 1 contact in "Besties"
 
   Scenario: should not see "Add to aspect" and see mention if already a follower
diff --git a/features/disconnects_users.feature b/features/disconnects_users.feature
index 14c2cfe0f..fdede04d0 100644
--- a/features/disconnects_users.feature
+++ b/features/disconnects_users.feature
@@ -42,6 +42,8 @@ Feature: disconnecting users
 
   Scenario: remove a non-mutual contact from the aspect edit page
     When I go to the home page
+      And I follow "Contacts"
+      And I follow "Besties"
       And I follow "Edit Besties"
 
       And I wait for the ajax to finish
diff --git a/features/manages_aspects.feature b/features/manages_aspects.feature
index c2d6fdf39..98bdb147d 100644
--- a/features/manages_aspects.feature
+++ b/features/manages_aspects.feature
@@ -23,9 +23,9 @@ Feature: User manages contacts
     Given I am signed in
     And I have 2 contacts
     And I have an aspect called "Cat People"
-    When I follow "My Contacts"
+    When I follow "Contacts"
+    And I follow "Cat People"
     And I follow "Edit Cat People"
-    And I wait for the ajax to finish
     And I press the first ".contact_list .button"
     And I wait for the ajax to finish
     Then I should have 1 contact in "Cat People"
diff --git a/features/posts.feature b/features/posts.feature
index 89fabc5a9..0973aa386 100644
--- a/features/posts.feature
+++ b/features/posts.feature
@@ -20,7 +20,7 @@ Feature: posting
       Given I expand the publisher
       When I fill in "status_message_fake_text" with "I am eating a yogurt"
         And I press "Share"
-        And I follow "My Contacts"
+        And I follow "Your Aspects"
       Then I should see "I am eating a yogurt" within ".stream_element"
 
     Scenario: post a photo without text
@@ -30,7 +30,7 @@ Feature: posting
       Then I should see an uploaded image within the photo drop zone
       And I press "Share"
       And I wait for the ajax to finish
-      And I follow "My Contacts"
+      And I follow "Your Aspects"
       Then I should see a "img" within ".stream_element:first div.photo_attachments"
       Then I log out
       And I sign in as "alice@alice.alice"
@@ -44,7 +44,7 @@ Feature: posting
       And I fill in "status_message_fake_text" with "Look at this dog"
       And I press "Share"
       And I wait for the ajax to finish
-      And I follow "My Contacts"
+      And I follow "Your Aspects"
       Then I should see a "img" within ".stream_element:first div.photo_attachments"
       And I should see "Look at this dog" within ".stream_element:first"
       Then I log out
@@ -76,12 +76,12 @@ Feature: posting
       When I fill in "status_message_fake_text" with "I am eating a yogurt"
         And I press "Share"
         And I wait for the ajax to finish
-        And I follow "My Contacts"
+        And I follow "Your Aspects"
         And I hover over the post
         And I preemptively confirm the alert
         And I click to delete the first post
         And I wait for the ajax to finish
-        And I follow "My Contacts"
+        And I follow "Your Aspects"
         Then I should not see "I am eating a yogurt"
 
     Scenario Outline: post to one aspect