Commit ccf3ed43 authored by Alexis Reigel's avatar Alexis Reigel

swap user's name and the user's username

parent c5271833
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
= user_avatar_without_link(user: user, size: 32) = user_avatar_without_link(user: user, size: 32)
%div %div
%strong= gpg_key.user.username %strong= gpg_key.user.name
%div= gpg_key.user.name %div @#{gpg_key.user.username}
- else - else
= mail_to user_email do = mail_to user_email do
%div %div
......
...@@ -285,8 +285,8 @@ describe 'Commits' do ...@@ -285,8 +285,8 @@ describe 'Commits' do
click_on 'Verified' click_on 'Verified'
within '.popover' do within '.popover' do
expect(page).to have_content 'This commit was signed with a verified signature.' expect(page).to have_content 'This commit was signed with a verified signature.'
expect(page).to have_content 'nannie.bernhard'
expect(page).to have_content 'Nannie Bernhard' expect(page).to have_content 'Nannie Bernhard'
expect(page).to have_content '@nannie.bernhard'
expect(page).to have_content "GPG Key ID: #{GpgHelpers::User1.primary_keyid}" expect(page).to have_content "GPG Key ID: #{GpgHelpers::User1.primary_keyid}"
end end
......
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