Skip to content
This repository has been archived by the owner on Nov 7, 2022. It is now read-only.

Commit

Permalink
User settings mutation (mastodon#2270)
Browse files Browse the repository at this point in the history
* Add user spec for settings, highlight global default mutation issue

* Fix mutation issue caused by settings/preferences spec
  • Loading branch information
mjankowski authored and seefood committed Apr 28, 2017
1 parent b77f14b commit 48003c8
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 2 deletions.
4 changes: 2 additions & 2 deletions spec/controllers/settings/preferences_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

it 'updates user settings' do
user.settings['boost_modal'] = false
user.settings['notification_emails']['follow'] = false
user.settings['interactions']['must_be_follower'] = true
user.settings['notification_emails'] = user.settings['notification_emails'].merge('follow' => false)
user.settings['interactions'] = user.settings['interactions'].merge('must_be_follower' => true)

put :update, params: {
user: {
Expand Down
31 changes: 31 additions & 0 deletions spec/models/user_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,37 @@
end
end

describe 'settings' do
it 'inherits default settings from default yml' do
expect(Setting.boost_modal).to eq false
expect(Setting.interactions['must_be_follower']).to eq false

user = User.new
expect(user.settings.boost_modal).to eq false
expect(user.settings.interactions['must_be_follower']).to eq false
end

it 'can update settings' do
user = Fabricate(:user)
expect(user.settings['interactions']['must_be_follower']).to eq false
user.settings['interactions'] = user.settings['interactions'].merge('must_be_follower' => true)
user.reload

expect(user.settings['interactions']['must_be_follower']).to eq true
end

xit 'does not mutate defaults via the cache' do
user = Fabricate(:user)
user.settings['interactions']['must_be_follower'] = true
# TODO
# This mutates the global settings default such that future user
# instances will inherit the incorrect starting values

other = Fabricate(:user)
expect(other.settings['interactions']['must_be_follower']).to eq false
end
end

describe 'scopes' do
describe 'recent' do
it 'returns an array of recent users ordered by id' do
Expand Down

0 comments on commit 48003c8

Please sign in to comment.