Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Separate notifications preferences from general preferences (#4447)

Browse source 
* Separate notifications preferences from general preferences

* Refine settings/notifications/show

* remove preferences.notifications
This commit is contained in:
Yamagishi Kazutoshi 2017-10-04 17:22:52 +09:00 • committed by Eugen Rochko
parent 0e1b0f2747
commit 178f718a9b
14 changed files with 117 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spec/controllers/settings/preferences_controller_spec.rb
View file

@ -29,15 +29,11 @@ describe Settings::PreferencesController do
it 'updates user settings' do
user.settings['boost_modal'] = false
user.settings['delete_modal'] = 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: {
setting_boost_modal: '1',
setting_delete_modal: '0',
notification_emails: { follow: '1' },
interactions: { must_be_follower: '0' },
}
}
@ -45,8 +41,6 @@ describe Settings::PreferencesController do
user.reload
expect(user.settings['boost_modal']).to be true
expect(user.settings['delete_modal']).to be false
expect(user.settings['notification_emails']['follow']).to be true
expect(user.settings['interactions']['must_be_follower']).to be false
end
end
end