diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-07-07 08:33:26 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-07-07 09:15:49 +0300 |
| commit | b37b7deedf253a37f4044b25e769f0de48947c55 (patch) | |
| tree | 52a712bf10167c0620aca22dbcf53be5d45ad26b | |
| parent | 197b9793db4ff84d953dcfa9c79a4a2959c5c512 (diff) | |
| download | gitlab-ce-b37b7deedf253a37f4044b25e769f0de48947c55.tar.gz | |
Fix invite user feature test and improve request member UI row
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/views/shared/members/_member.html.haml | 2 | ||||
| -rw-r--r-- | features/steps/admin/groups.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml index 8701c8deca0..5ae485f36ba 100644 --- a/app/views/shared/members/_member.html.haml +++ b/app/views/shared/members/_member.html.haml @@ -55,7 +55,7 @@ .cgray - if member.request? - – Requested + Requested = time_ago_with_tooltip(member.requested_at) - else Joined #{time_ago_with_tooltip(member.created_at)} diff --git a/features/steps/admin/groups.rb b/features/steps/admin/groups.rb index 8613dc537cc..0c89a3db9ad 100644 --- a/features/steps/admin/groups.rb +++ b/features/steps/admin/groups.rb @@ -62,7 +62,8 @@ class Spinach::Features::AdminGroups < Spinach::FeatureSteps step 'I should see "johndoe@gitlab.com" in team list in every project as "Reporter"' do page.within ".group-users-list" do - expect(page).to have_content "johndoe@gitlab.com – Invited by" + expect(page).to have_content "johndoe@gitlab.com" + expect(page).to have_content "Invited by" expect(page).to have_content "Reporter" end end |