mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-02-02 23:41:44 +01:00
Code Issues Projects Releases Wiki Activity

Fix issue with saving empty fields values on profile update (#33689)

Browse Source
This commit is contained in:
Matt Jankowski 2025-01-22 13:50:15 -05:00 committed by GitHub
parent a6fc776c6f
commit 4a9c49ee43
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/settings/profiles_controller.rb
View File

@ -20,7 +20,7 @@ class Settings::ProfilesController < Settings::BaseController
private private
def account_params def account_params
params.expect(account: [:display_name, :note, :avatar, :header, :bot, fields_attributes: [:name, :value]]) params.expect(account: [:display_name, :note, :avatar, :header, :bot, fields_attributes: [[:name, :value]]])
end end
def set_account def set_account

32
spec/system/profile_spec.rb
View File

@ -5,8 +5,6 @@ require 'rails_helper'
RSpec.describe 'Profile' do RSpec.describe 'Profile' do
include ProfileStories include ProfileStories
subject { page }
let(:local_domain) { Rails.configuration.x.local_domain } let(:local_domain) { Rails.configuration.x.local_domain }
before do before do
@ -17,7 +15,8 @@ RSpec.describe 'Profile' do
it 'I can view public account page for Alice' do it 'I can view public account page for Alice' do
visit account_path('alice') visit account_path('alice')
expect(subject).to have_title("alice (@alice@#{local_domain})") expect(page)
.to have_title("alice (@alice@#{local_domain})")
end end
it 'I can change my account' do it 'I can change my account' do
@ -26,8 +25,31 @@ RSpec.describe 'Profile' do
fill_in 'Display name', with: 'Bob' fill_in 'Display name', with: 'Bob'
fill_in 'Bio', with: 'Bob is silent' fill_in 'Bio', with: 'Bob is silent'
first('button[type=submit]').click fill_in 'account_fields_attributes_0_name', with: 'Personal Website'
fill_in 'account_fields_attributes_0_value', with: 'https://host.example/personal'
expect(subject).to have_content 'Changes successfully saved!' fill_in 'account_fields_attributes_1_name', with: 'Professional Biography'
fill_in 'account_fields_attributes_1_value', with: 'https://host.example/pro'
expect { submit_form }
.to change { bob.account.reload.display_name }.to('Bob')
.and(change_account_fields)
expect(page)
.to have_content 'Changes successfully saved!'
end
def submit_form
first('button[type=submit]').click
end
def change_account_fields
change { bob.account.reload.fields }
.from([])
.to(
contain_exactly(
be_a(Account::Field),
be_a(Account::Field)
)
)
end end
end end