Commit 57b0636c authored by Douwe Maan's avatar Douwe Maan
Browse files

Merge branch 'bvl-handle-missing-attribute-when-updating-username' into 'master'

Handle invalid params when trying update_username

Closes #44925

See merge request gitlab-org/gitlab-ce!18167
parents 611abb3e 3faa7653
......@@ -51,7 +51,7 @@ def audit_log
end
def update_username
result = Users::UpdateService.new(current_user, user: @user, username: user_params[:username]).execute
result = Users::UpdateService.new(current_user, user: @user, username: username_param).execute
options = if result[:status] == :success
{ notice: "Username successfully changed" }
......@@ -72,6 +72,10 @@ def authorize_change_username!
return render_404 unless @user.can_change_username?
end
def username_param
@username_param ||= user_params.require(:username)
end
def user_params
@user_params ||= params.require(:user).permit(
:avatar,
......
......@@ -84,6 +84,13 @@
expect(user.username).to eq(new_username)
end
it 'raises a correct error when the username is missing' do
sign_in(user)
expect { put :update_username, user: { gandalf: 'you shall not pass' } }
.to raise_error(ActionController::ParameterMissing)
end
context 'with legacy storage' do
it 'moves dependent projects to new namespace' do
project = create(:project_empty_repo, :legacy_storage, namespace: namespace)
......
Supports Markdown
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