consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1645 from consul/login-by-username

Browse Source 
Allow users to login using username
This commit is contained in:
Raimond Garcia
2017-06-13 13:23:49 +02:00
committed by GitHub
parent 0e6c689abe 2f895d2f6b
commit 300634443c
12 changed files with 108 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spec/features/account_spec.rb
View File

@@ -138,6 +138,6 @@ feature 'Account' do
login_through_form_as(@user)
expect(page).to have_content "Invalid email or password"
expect(page).to have_content "Invalid login or password"
end
end

4
spec/features/moderation/users_spec.rb
View File

@@ -42,11 +42,11 @@ feature 'Moderate users' do
visit root_path
click_link 'Sign in'
fill_in 'user_email', with: citizen.email
fill_in 'user_login', with: citizen.email
fill_in 'user_password', with: citizen.password
click_button 'Enter'
expect(page).to have_content 'Invalid email or password'
expect(page).to have_content 'Invalid login or password'
expect(current_path).to eq(new_user_session_path)
end

111
spec/features/users_auth_spec.rb
View File

@@ -3,43 +3,102 @@ require 'rails_helper'
feature 'Users' do
context 'Regular authentication' do
scenario 'Sign up' do
visit '/'
click_link 'Register'
context 'Sign up' do
fill_in 'user_username', with: 'Manuela Carmena'
fill_in 'user_email', with: 'manuela@consul.dev'
fill_in 'user_password', with: 'judgementday'
fill_in 'user_password_confirmation', with: 'judgementday'
check 'user_terms_of_service'
scenario 'Success' do
visit '/'
click_link 'Register'
click_button 'Register'
fill_in 'user_username', with: 'Manuela Carmena'
fill_in 'user_email', with: 'manuela@consul.dev'
fill_in 'user_password', with: 'judgementday'
fill_in 'user_password_confirmation', with: 'judgementday'
check 'user_terms_of_service'
expect(page).to have_content "You have been sent a message containing a verification link. Please click on this link to activate your account."
click_button 'Register'
confirm_email
expect(page).to have_content "You have been sent a message containing a verification link. Please click on this link to activate your account."
confirm_email
expect(page).to have_content "Your account has been confirmed."
end
scenario 'Errors on sign up' do
visit '/'
click_link 'Register'
click_button 'Register'
expect(page).to have_content error_message
end
expect(page).to have_content "Your account has been confirmed."
end
scenario 'Errors on sign up' do
visit '/'
click_link 'Register'
click_button 'Register'
context 'Sign in' do
expect(page).to have_content error_message
end
scenario 'sign in with email' do
create(:user, email: 'manuela@consul.dev', password: 'judgementday')
scenario 'Sign in' do
create(:user, email: 'manuela@consul.dev', password: 'judgementday')
visit '/'
click_link 'Sign in'
fill_in 'user_login', with: 'manuela@consul.dev'
fill_in 'user_password', with: 'judgementday'
click_button 'Enter'
visit '/'
click_link 'Sign in'
fill_in 'user_email', with: 'manuela@consul.dev'
fill_in 'user_password', with: 'judgementday'
click_button 'Enter'
expect(page).to have_content 'You have been signed in successfully.'
end
expect(page).to have_content 'You have been signed in successfully.'
scenario 'Sign in with username' do
create(:user, username: '👻👽👾🤖', email: 'ash@nostromo.dev', password: 'xenomorph')
visit '/'
click_link 'Sign in'
fill_in 'user_login', with: '👻👽👾🤖'
fill_in 'user_password', with: 'xenomorph'
click_button 'Enter'
expect(page).to have_content 'You have been signed in successfully.'
end
scenario 'Avoid username-email collisions' do
u1 = create(:user, username: 'Spidey', email: 'peter@nyc.dev', password: 'greatpower')
u2 = create(:user, username: 'peter@nyc.dev', email: 'venom@nyc.dev', password: 'symbiote')
visit '/'
click_link 'Sign in'
fill_in 'user_login', with: 'peter@nyc.dev'
fill_in 'user_password', with: 'greatpower'
click_button 'Enter'
expect(page).to have_content 'You have been signed in successfully.'
visit account_path
expect(page).to have_link 'My activity', href: user_path(u1)
visit '/'
click_link 'Sign out'
expect(page).to have_content 'You have been signed out successfully.'
click_link 'Sign in'
fill_in 'user_login', with: 'peter@nyc.dev'
fill_in 'user_password', with: 'symbiote'
click_button 'Enter'
expect(page).to_not have_content 'You have been signed in successfully.'
expect(page).to have_content 'Invalid login or password.'
fill_in 'user_login', with: 'venom@nyc.dev'
fill_in 'user_password', with: 'symbiote'
click_button 'Enter'
expect(page).to have_content 'You have been signed in successfully.'
visit account_path
expect(page).to have_link 'My activity', href: user_path(u2)
end
end
end

2
spec/features/welcome_spec.rb
View File

@@ -18,7 +18,7 @@ feature "Welcome screen" do
visit email_path(email_verification_token: encrypted)
fill_in 'user_email', with: user.email
fill_in 'user_login', with: user.email
fill_in 'user_password', with: user.password
click_button 'Enter'