Almost done with left-nav, added link to aspect edit facebox, colored share button

6 files changed, 31 insertions, 33 deletions

diff --git a/features/comments.feature b/features/comments.feature
index 57c5f8b3c..49713a4da 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 "All Aspects"
+    And I follow "My Contacts"
     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 43a0710e0..812343e66 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 "All Aspects" in the header
+    When I follow "My Contacts"
 
     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 "All Aspects" in the header
+    When I follow "My Contacts"
       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 "All Aspects" in the header
+    When I follow "My Contacts"
    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 "All Aspects" in the header
+    When I follow "My Contacts"
    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 f8e3a8551..14c2cfe0f 100644
--- a/features/disconnects_users.feature
+++ b/features/disconnects_users.feature
@@ -18,7 +18,7 @@ Feature: disconnecting users
     And I remove the person from my 1st aspect
     And I am on the home page
 
-   Then I should see "no contacts" within "#sharers"
+    Then I should have 0 contacts in "Besties"
 
     Then I go to the destroy user session page
     When I sign in as "alice@alice.alice"
@@ -31,7 +31,7 @@ Feature: disconnecting users
 
     And I remove the person from my 1st aspect
 
-    When I follow "All Aspects" in the header
+    When I follow "My Contacts"
       Then I should have 0 contacts in "Besties"
    
     Then I go to the destroy user session page
@@ -42,14 +42,14 @@ Feature: disconnecting users
 
   Scenario: remove a non-mutual contact from the aspect edit page
     When I go to the home page
-      And I press the first ".contact-count" within "#aspect_listings"
+      And I follow "Edit Besties"
 
       And I wait for the ajax to finish
       And I preemptively confirm the alert
       And I press the first ".added" within "#facebox .contact_list ul > li:first-child"
 
       And I wait for the ajax to finish
-    When I follow "All Aspects" in the header
+    When I follow "My Contacts"
       Then I should have 0 contacts in "Besties"
 
       Then I go to the destroy user session page
diff --git a/features/embedder.feature b/features/embedder.feature
index 96f08da48..8a9beb431 100644
--- a/features/embedder.feature
+++ b/features/embedder.feature
@@ -11,7 +11,7 @@
 #       Given I expand the publisher
 #       When I fill in "status_message_fake_text" with "Look at this awesome video: https://www.youtube.com/watch?v=53tq9g35kwk"
 #         And I press "Share"
-#         And I follow "All Aspects"
+#         And I follow "My Contacts"
 #       Then I should see "Look at this awesome video: Youtube: Leekspin" within ".stream_element"
 #       When I follow "Youtube: Leekspin"
 #       And I wait for the ajax to finish
diff --git a/features/manages_aspects.feature b/features/manages_aspects.feature
index f42a81299..c2d6fdf39 100644
--- a/features/manages_aspects.feature
+++ b/features/manages_aspects.feature
@@ -6,35 +6,31 @@ Feature: User manages contacts
 
   Scenario: creating an aspect from contacts index
     Given I am signed in
-    When I follow "All Aspects" in the header
-    And I follow "Your Contacts"
-    And I follow "My Contacts"
+    And I am on the contacts page
     And I follow "+ Add an aspect"
     And I fill in "Name" with "Dorm Mates" in the modal window
     And I press "Create" in the modal window
-    Then I should see "Dorm Mates" in the header
+    Then I should see "Dorm Mates" within "#aspect_nav"
     
   Scenario: creating an aspect from homepage
     Given I am signed in
-    When I follow "All Aspects" in the header
-    And I follow "+" in the header
+    When I follow "Add an aspect"
     And I fill in "Name" with "losers" in the modal window
     And I press "Create" in the modal window
-    Then I should see "losers" in the header
+    Then I should see "losers" within "#aspect_nav"
 
-  Scenario: Editing the aspect memberships of a contact from the 'sharers' facebox
+  Scenario: Editing the aspect memberships of a contact from the aspect edit facebox
     Given I am signed in
     And I have 2 contacts
     And I have an aspect called "Cat People"
-    When I follow "All Aspects" in the header
-    And I follow "2 contacts" within "#sharers"
+    When I follow "My Contacts"
+    And I follow "Edit Cat People"
     And I wait for the ajax to finish
-    And I press the first ".toggle.button"
-    And I press the 2nd "li" within ".dropdown.active .dropdown_list"
+    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"
 
-    When I press the 2nd "li" within ".dropdown.active .dropdown_list"
+    When I press the first ".contact_list .button"
     And I wait for the ajax to finish
     Then I should have 0 contacts in "Cat People"
 
diff --git a/features/posts.feature b/features/posts.feature
index 94b59108b..89fabc5a9 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 "All Aspects"
+        And I follow "My Contacts"
       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 "All Aspects"
+      And I follow "My Contacts"
       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 "All Aspects"
+      And I follow "My Contacts"
       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
@@ -68,7 +68,7 @@ Feature: posting
         And I wait for the ajax to finish
         And I go to "bob@bob.bob"'s page
         Then I should not see "Here is a post for you to hide"
-        And I follow "All Aspects"
+        And I am on the aspects page
         Then I should not see "Here is a post for you to hide"
 
     Scenario: delete a post
@@ -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 "All Aspects"
+        And I follow "My Contacts"
         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 "All Aspects"
+        And I follow "My Contacts"
         Then I should not see "I am eating a yogurt"
 
     Scenario Outline: post to one aspect
@@ -90,8 +90,8 @@ Feature: posting
         And I expand the publisher
         And I fill in "status_message_fake_text" with "I am eating a yogurt"
         And I press "Share"
-        And I follow "All Aspects"
-        And I follow "<aspect>"
+        And I am on the aspects page
+        And I follow "<aspect>" within "#aspect_nav"
       Then I should <see> "I am eating a yogurt"
 
       Examples:
@@ -106,7 +106,8 @@ Feature: posting
         And I expand the publisher in the modal window
         And I append "I am eating a yogurt" to the publisher
         And I press "Share" in the modal window
-        And I follow "<aspect>"
+        And I am on the aspects page
+        And I follow "<aspect>" within "#aspect_nav"
         Then I should <see> "I am eating a yogurt"
 
         Examples:
@@ -122,7 +123,8 @@ Feature: posting
         And I append "I am eating a yogurt" to the publisher
         And I follow "DidntPostTo" within "#publisher" in the modal window
         And I press "Share" in the modal window
-        And I follow "<aspect>"
+        And I am on the aspects page
+        And I follow "<aspect>" within "#aspect_nav"
         Then I should <see> "I am eating a yogurt"
 
         Examples: