nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check for all aspects in selected_contacts link switch, take out a couple extra steps

Browse source
This commit is contained in:
Raphael Sofaer 2011-07-04 08:39:07 -07:00
parent a715630471
commit 04f8abcf13
3 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/aspects/_selected_contacts.html.haml
View file

@ -12,7 +12,7 @@
- for person in people - for person in people
= person_image_link person = 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" = link_to t('.view_all_contacts'), contacts_path, :id => "view_all_contacts_link"
- else - else
= link_to t('.view_all_contacts'), contacts_path(:a_id => @aspect.id), :id => "view_all_contacts_link" = link_to t('.view_all_contacts'), contacts_path(:a_id => @aspect.id), :id => "view_all_contacts_link"

2
features/connects_users.feature
View file

@ -79,12 +79,10 @@ Feature: sending and receiving requests
And I wait for the ajax to finish And I wait for the ajax to finish
When I go to the home page When I go to the home page
When I follow "Your Aspects"
Then I should have 1 contact in "Super People" Then I should have 1 contact in "Super People"
Then I go to the destroy user session page Then I go to the destroy user session page
When I sign in as "bob@bob.bob" When I sign in as "bob@bob.bob"
When I follow "Your Aspects"
Then I should have 1 contact in "Besties" Then I should have 1 contact in "Besties"
Scenario: should not see "Add to aspect" and see mention if already a follower Scenario: should not see "Add to aspect" and see mention if already a follower

2
features/step_definitions/session_steps.rb
View file

@ -16,8 +16,6 @@ end
When /^I try to sign in$/ do When /^I try to sign in$/ do
@me ||= Factory(:user_with_aspect, :getting_started => false) @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)) page.driver.visit(new_integration_sessions_path(:user_id => @me.id))
And %(I press "Login") And %(I press "Login")
# To save time as compared to: # To save time as compared to: