diff --git a/app/views/aspects/_aspect.haml b/app/views/aspects/_aspect.haml index 2f7053f8e..ec34c93a9 100644 --- a/app/views/aspects/_aspect.haml +++ b/app/views/aspects/_aspect.haml @@ -1,9 +1,8 @@ %li{:data=>{:guid=>aspect.id}, :class => ("dull" if contacts.size == 0)} .right %b - = link_to t('contacts', :count => contacts.size), edit_aspect_path(aspect), :rel => 'facebox' + = link_to t('contacts', :count => contacts.size), edit_aspect_path(aspect), :rel => 'facebox', :class => 'contact-count' %b - /= link_to aspect.name, aspect_path(aspect), :rel => 'facebox', :class => 'name' = link_for_aspect(aspect, :class => 'hard_aspect_link') %br diff --git a/features/comments.feature b/features/comments.feature index 2bd1213ea..5f4ca52fc 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 "Home" + And I follow "All 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/disconnects_users.feature b/features/disconnects_users.feature index 6cc77a0b1..d1dc36b8d 100644 --- a/features/disconnects_users.feature +++ b/features/disconnects_users.feature @@ -45,7 +45,7 @@ Feature: disconnecting users Scenario: remove contact from the aspect edit page When I go to the home page - And I follow "Besties" within "#aspect_listings" + And I press the first ".contact-count" within "#aspect_listings" And I wait for the ajax to finish And I preemptively confirm the alert @@ -57,7 +57,7 @@ Feature: disconnecting users Scenario: cancel removing contact from the contact show page When I go to the home page - And I follow "Besties" within "#aspect_listings" + And I press the first ".contact-count" within "#aspect_listings" And I wait for the ajax to finish And I preemptively reject the alert diff --git a/features/manages_aspects.feature b/features/manages_aspects.feature index f248bf027..56287dd2f 100644 --- a/features/manages_aspects.feature +++ b/features/manages_aspects.feature @@ -6,7 +6,7 @@ Feature: User manages aspects Scenario: creating an aspect from manage aspects page Given I am signed in - When I follow "Home" in the header + When I follow "All aspects" in the header And I follow "Manage aspects" And I follow "+ Add a new aspect" And I fill in "Name" with "Dorm Mates" in the modal window @@ -15,7 +15,7 @@ Feature: User manages aspects Scenario: creating an aspect from homepage Given I am signed in - When I follow "Home" in the header + When I follow "All aspects" in the header And I follow "+" in the header And I fill in "Name" with "losers" in the modal window And I press "Create" in the modal window diff --git a/features/manages_contact_requests.feature b/features/manages_contact_requests.feature index f40e84753..cd8272a61 100644 --- a/features/manages_contact_requests.feature +++ b/features/manages_contact_requests.feature @@ -7,9 +7,9 @@ Feature: managing contact requests Scenario: seeing contact request notifications When I am on the home page - Then I should see "Home" in the header - Then I should see "Home" in the header - When I follow "Home" + Then I should see "All aspects" in the header + Then I should see "All aspects" in the header + When I follow "All aspects" Then I should see "new request!" @javascript diff --git a/features/posts.feature b/features/posts.feature index a37ca7b44..e24713a0c 100644 --- a/features/posts.feature +++ b/features/posts.feature @@ -21,18 +21,18 @@ 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 "Home" + And I follow "All aspects" Then I should see "I am eating a yogurt" within ".stream_element" Scenario: delete a post 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 "Home" + And I follow "All aspects" And I hover over the post And I preemptively confirm the alert And I click to delete the first post - And I follow "Home" + And I follow "All aspects" Then I should not see "I am eating a yogurt" Scenario Outline: post to one aspect @@ -41,7 +41,7 @@ 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 "Home" + And I follow "All aspects" And I follow "" Then I should "I am eating a yogurt" diff --git a/features/saved_state.feature b/features/saved_state.feature index b8e5e26ff..a763112d7 100644 --- a/features/saved_state.feature +++ b/features/saved_state.feature @@ -28,8 +28,8 @@ Feature: saved state But I should have aspect "Closed 1" "not selected" But I should have aspect "Closed 2" "not selected" - And I follow "Home" - Then I should have aspect "Home" "selected" + And I follow "All aspects" + Then I should have aspect "All aspects" "selected" Scenario: home persists across sessions Given I am signed in @@ -37,9 +37,9 @@ Feature: saved state And I have an aspect called "Closed 2" And I am on the aspects page When I follow "Closed 1" - When I follow "Home" + When I follow "All aspects" - Then I should have aspect "Home" "selected" + Then I should have aspect "All aspects" "selected" Then I should have aspect "Closed 1" "not selected" Then I should have aspect "Closed 2" "not selected" @@ -51,6 +51,6 @@ Feature: saved state And I am signed in Then I should be on the aspects page - Then I should have aspect "Home" "selected" + Then I should have aspect "All aspects" "selected" Then I should have aspect "Closed 1" "not selected" Then I should have aspect "Closed 2" "not selected"