From ee0c897bba7c332ee3077db7605c9c3781cb4cb1 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Fri, 21 Apr 2017 12:07:17 -0400 Subject: User settings mutation (#2270) * Add user spec for settings, highlight global default mutation issue * Fix mutation issue caused by settings/preferences spec --- .../settings/preferences_controller_spec.rb | 4 +-- spec/models/user_spec.rb | 31 ++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/spec/controllers/settings/preferences_controller_spec.rb b/spec/controllers/settings/preferences_controller_spec.rb index 16cc87991..cdf595d4d 100644 --- a/spec/controllers/settings/preferences_controller_spec.rb +++ b/spec/controllers/settings/preferences_controller_spec.rb @@ -24,8 +24,8 @@ describe Settings::PreferencesController do 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: { diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 4ed1d5a0a..846a206ec 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -24,6 +24,37 @@ RSpec.describe User, type: :model do 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 -- cgit