kotovalexarian/lpr-partynest
Archived
1
0
Fork 0
Code Activity

Display username instead of email

Browse source
This commit is contained in:
Alex Kotov 2019-02-01 07:45:49 +05:00
parent 01effc198c
commit 010a8fd593
Signed by: kotovalexarian
GPG key ID: 553C0EBBEB5D5F08
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/application/_navbar.html.erb
View file

@ -17,7 +17,7 @@
<% if user_signed_in? %>
<ul class="navbar-nav ml-auto">
<li class="nav-item dropdown">
<%= link_to truncate(current_user.email),
<%= link_to current_user.account.username,
'#',
id: :navbarDropdown,
role: :button,

15
features/step_definitions/user.rb
View file

@ -21,7 +21,7 @@ Given 'I am signed in with email {string}' do |email|
click_on 'Войти'
end
expect(page).to have_css 'ul > li > a', text: @user.email
expect(page).to have_css 'ul > li > a', text: @user.account.username
end
Given 'I am signed in with email {string} ' \
@ -37,7 +37,7 @@ Given 'I am signed in with email {string} ' \
click_on 'Войти'
end
expect(page).to have_css 'ul > li > a', text: @user.email
expect(page).to have_css 'ul > li > a', text: @user.account.username
end
Given 'I am signed in as party supporter' do
@ -55,7 +55,7 @@ Given 'I am signed in as party supporter' do
click_on 'Войти'
end
expect(page).to have_css 'ul > li > a', text: @user.email
expect(page).to have_css 'ul > li > a', text: @user.account.username
end
Given 'I am signed in as party member' do
@ -73,7 +73,7 @@ Given 'I am signed in as party member' do
click_on 'Войти'
end
expect(page).to have_css 'ul > li > a', text: @user.email
expect(page).to have_css 'ul > li > a', text: @user.account.username
end
Given 'I am signed in as excluded party member' do
@ -91,7 +91,7 @@ Given 'I am signed in as excluded party member' do
click_on 'Войти'
end
expect(page).to have_css 'ul > li > a', text: @user.email
expect(page).to have_css 'ul > li > a', text: @user.account.username
end
When 'I try to sign in with email {string} ' \
@ -107,7 +107,7 @@ When 'I try to sign in with email {string} ' \
end
When 'I try to sign out' do
click_on @user.email
click_on @user.account.username
click_on 'Выйти'
end
@ -117,7 +117,8 @@ When 'I follow confirmation link for email {string}' do |email|
end
Then 'I am signed in as {string}' do |email|
expect(page).to have_css 'ul > li > a', text: email
user = User.find_by! email: email
expect(page).to have_css 'ul > li > a', text: user.account.username
end
Then 'I fail to sign in' do