Commit 85e8d1bc authored by Cecilia Vela Gurovic's avatar Cecilia Vela Gurovic
Browse files

Bug 1814621: Updating steps in friends.feature

Change-Id: If122d14a6d64b83aea07d313c458710b4db7aca0
parent 57a9051e
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
{/if} {/if}
{if $count > 0} {if $count > 0}
<div class="panel panel-default view-container"> <div class="card view-container">
<h2 id="searchresultsheading" class="panel-heading">{str tag=Results}</h2> <h2 id="searchresultsheading" class="card-header">{str tag=Results}</h2>
<div id="friendslist" class="list-group"> <div id="friendslist" class="list-group">
{$results.tablerows|safe} {$results.tablerows|safe}
</div> </div>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
{$user->display_name} {$user->display_name}
{if $user->pending} {if $user->pending}
<span class="pendingfriend text-small text-midtone"> <span class="pendingfriend text-small text-midtone">
- {str tag='pending' section='group'} - {str tag='pendingsince' section='group' arg1=$user->pending_time}
</span> </span>
{elseif $user->friend && $page == 'find'} {elseif $user->friend && $page == 'find'}
<span class="existingfriend text-small text-midtone"> <span class="existingfriend text-small text-midtone">
......
...@@ -23,7 +23,7 @@ Background: ...@@ -23,7 +23,7 @@ Background:
Scenario: UserA sends friend requests to UserB, UserC, User E Scenario: UserA sends friend requests to UserB, UserC, User E
Given I log in as "UserA" with password "Kupuh1pa!" Given I log in as "UserA" with password "Kupuh1pa!"
And I choose "Find people" in "Engage" from main menu And I choose "People" in "Engage" from main menu
Then I should see "Bob UserB" Then I should see "Bob UserB"
And I should see "Cecilia UserC" And I should see "Cecilia UserC"
And I should not see "Dave UserD" And I should not see "Dave UserD"
...@@ -55,17 +55,17 @@ Scenario: UserA sends friend requests to UserB, UserC, User E ...@@ -55,17 +55,17 @@ Scenario: UserA sends friend requests to UserB, UserC, User E
Given I log in as "UserB" with password "Kupuh1pa!" Given I log in as "UserB" with password "Kupuh1pa!"
When I follow "pending friend" When I follow "pending friend"
Then I should see "Angela UserA (UserA)" Then I should see "Angela UserA (UserA)"
And I should see the date "today" in the "h3.card-header" element with the format "l, d F Y" And I should see the date "today" in the ".pendingfriend" element with the format "l, d F Y"
And I should see "Member of Institution One" And I should see "Member of Institution One"
When I press "Approve request" When I press "Approve"
Then I should see "Accepted friend request" Then I should see "Accepted friend request"
And I log out And I log out
Given I log in as "UserC" with password "Kupuh1pa!" Given I log in as "UserC" with password "Kupuh1pa!"
When I follow "pending friend" When I follow "pending friend"
Then I should see "Angela UserA (UserA)" Then I should see "Angela UserA (UserA)"
And I should see the date "today" in the "h3.card-header" element with the format "l, d F Y" And I should see the date "today" in the ".pendingfriend" element with the format "l, d F Y"
And I should see "Member of Institution One" And I should see "Member of Institution One"
When I click on "Deny request" When I click on "Deny"
Then I should see "Reason for rejecting request" Then I should see "Reason for rejecting request"
When I fill in "I don't know who you are" for "Reason for rejecting request" When I fill in "I don't know who you are" for "Reason for rejecting request"
And I press "Deny friend request" And I press "Deny friend request"
...@@ -74,7 +74,7 @@ Scenario: UserA sends friend requests to UserB, UserC, User E ...@@ -74,7 +74,7 @@ Scenario: UserA sends friend requests to UserB, UserC, User E
# UserC logs in and tries to add UserA who has set their friends control to Nobody may add me as a friend # UserC logs in and tries to add UserA who has set their friends control to Nobody may add me as a friend
Given I log in as "UserE" with password "Kupuh1pa!" Given I log in as "UserE" with password "Kupuh1pa!"
And I choose "Find people" in "Engage" from main menu And I choose "People" in "Engage" from main menu
When I select "Everyone" from "Filter" When I select "Everyone" from "Filter"
And I press "Search" And I press "Search"
Then I should see "This user does not want any new friends." in the "Angela UserA" row Then I should see "This user does not want any new friends." in the "Angela UserA" row
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment