Skip to content
Snippets Groups Projects
Commit f250a11b authored by azul's avatar azul
Browse files

Merge branch 'fix/8796-alternate-email' into 'master'

fix: alternate email dialogue

Closes #8796

See merge request !53
parents a20a1c16 028376fe
Branches
Tags
1 merge request!53fix: alternate email dialogue
Pipeline #
...@@ -31,6 +31,12 @@ class UsersController < ApplicationController ...@@ -31,6 +31,12 @@ class UsersController < ApplicationController
def edit def edit
end end
def update
@user.update_attributes user_params
flash[:notice] = I18n.t(:changes_saved) if @user.valid?
respond_with @user, location: edit_user_path(@user)
end
def deactivate def deactivate
@user.account.disable @user.account.disable
flash[:notice] = I18n.t("actions.user_disabled_message", username: @user.username) flash[:notice] = I18n.t("actions.user_disabled_message", username: @user.username)
...@@ -62,7 +68,7 @@ class UsersController < ApplicationController ...@@ -62,7 +68,7 @@ class UsersController < ApplicationController
if admin? if admin?
params.require(:user).permit(:effective_service_level) params.require(:user).permit(:effective_service_level)
else else
params.require(:user).permit(:password, :password_confirmation) params.require(:user).permit(:contact_email)
end end
end end
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
-# 'change_password' -# 'change_password'
-# 'change_pgp_key' -# 'change_pgp_key'
-# 'change_service_level' -# 'change_service_level'
-# 'contact_email'
-# 'destroy_account' -# 'destroy_account'
- actions = APP_CONFIG[admin? ? :admin_actions : :user_actions] || [] - actions = APP_CONFIG[admin? ? :admin_actions : :user_actions] || []
- actions.each do |action| - actions.each do |action|
......
require 'test_helper'
class AlternateEmailTest < BrowserIntegrationTest
test "change alternate email" do
username, password = submit_signup
click_on 'Account Settings'
within(".edit_user") do
fill_in 'user_contact_email', with: 'test@leap.se'
click_on 'Save'
end
assert page.has_content?('Changes saved successfully')
assert_equal 'test@leap.se',
page.find('#user_contact_email').value
end
test "change alternate email to invalid" do
username, password = submit_signup
click_on 'Account Settings'
within(".edit_user") do
fill_in 'user_contact_email', with: 'test@invalid'
click_on 'Save'
assert page.has_content?('is invalid')
end
end
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment