Check for all aspects in selected_contacts link switch, take out a couple extra steps
This commit is contained in:
parent
a715630471
commit
04f8abcf13
3 changed files with 1 additions and 5 deletions
|
|
@ -12,7 +12,7 @@
|
|||
- for person in people
|
||||
= person_image_link person
|
||||
|
||||
- if @aspect_ids.size > 1
|
||||
- if all_aspects_selected? || @aspect_ids.size > 1
|
||||
= link_to t('.view_all_contacts'), contacts_path, :id => "view_all_contacts_link"
|
||||
- else
|
||||
= link_to t('.view_all_contacts'), contacts_path(:a_id => @aspect.id), :id => "view_all_contacts_link"
|
||||
|
|
|
|||
|
|
@ -79,12 +79,10 @@ Feature: sending and receiving requests
|
|||
And I wait for the ajax to finish
|
||||
|
||||
When I go to the home page
|
||||
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 "Your Aspects"
|
||||
Then I should have 1 contact in "Besties"
|
||||
|
||||
Scenario: should not see "Add to aspect" and see mention if already a follower
|
||||
|
|
|
|||
|
|
@ -16,8 +16,6 @@ end
|
|||
|
||||
When /^I try to sign in$/ do
|
||||
@me ||= Factory(:user_with_aspect, :getting_started => false)
|
||||
#page.driver.post(integration_sessions_path(:user_id => @me.id))
|
||||
|
||||
page.driver.visit(new_integration_sessions_path(:user_id => @me.id))
|
||||
And %(I press "Login")
|
||||
# To save time as compared to:
|
||||
|
|
|
|||
Loading…
Reference in a new issue