From 2dda356e3fc7000ea630b802588cb91df296a89f Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Thu, 20 Apr 2017 21:26:52 -0400 Subject: Clean up settings/preferences controller (#2237) * Add missing fields group on preferences page * Clean up settings/preferences controller * Extract a UserSettingsDecorator --- .../settings/preferences_controller_spec.rb | 39 ++++++++++++++++--- spec/lib/user_settings_decorator_spec.rb | 45 ++++++++++++++++++++++ 2 files changed, 79 insertions(+), 5 deletions(-) create mode 100644 spec/lib/user_settings_decorator_spec.rb (limited to 'spec') diff --git a/spec/controllers/settings/preferences_controller_spec.rb b/spec/controllers/settings/preferences_controller_spec.rb index a5d349d6d..16cc87991 100644 --- a/spec/controllers/settings/preferences_controller_spec.rb +++ b/spec/controllers/settings/preferences_controller_spec.rb @@ -1,16 +1,45 @@ require 'rails_helper' -RSpec.describe Settings::PreferencesController, type: :controller do - +describe Settings::PreferencesController do + let(:user) { Fabricate(:user) } before do - sign_in Fabricate(:user), scope: :user + sign_in user, scope: :user end - describe "GET #show" do - it "returns http success" do + describe 'GET #show' do + it 'returns http success' do get :show + expect(response).to have_http_status(:success) end end + describe 'PUT #update' do + it 'udpates the user record' do + put :update, params: { user: { locale: 'en' } } + + expect(response).to redirect_to(settings_preferences_path) + expect(user.reload.locale).to eq 'en' + end + + it 'updates user settings' do + user.settings['boost_modal'] = false + user.settings['notification_emails']['follow'] = false + user.settings['interactions']['must_be_follower'] = true + + put :update, params: { + user: { + setting_boost_modal: '1', + notification_emails: { follow: '1' }, + interactions: { must_be_follower: '0' } + } + } + + expect(response).to redirect_to(settings_preferences_path) + user.reload + expect(user.settings['boost_modal']).to be true + expect(user.settings['notification_emails']['follow']).to be true + expect(user.settings['interactions']['must_be_follower']).to be false + end + end end diff --git a/spec/lib/user_settings_decorator_spec.rb b/spec/lib/user_settings_decorator_spec.rb new file mode 100644 index 000000000..466c57fa5 --- /dev/null +++ b/spec/lib/user_settings_decorator_spec.rb @@ -0,0 +1,45 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe UserSettingsDecorator do + describe 'update' do + let(:user) { Fabricate(:user) } + let(:settings) { described_class.new(user) } + + it 'updates the user settings value for email notifications' do + values = { 'notification_emails' => { 'follow' => '1' } } + + settings.update(values) + expect(user.settings['notification_emails']['follow']).to eq true + end + + it 'updates the user settings value for interactions' do + values = { 'interactions' => { 'must_be_follower' => '0' } } + + settings.update(values) + expect(user.settings['interactions']['must_be_follower']).to eq false + end + + it 'updates the user settings value for privacy' do + values = { 'setting_default_privacy' => 'public' } + + settings.update(values) + expect(user.settings['default_privacy']).to eq 'public' + end + + it 'updates the user settings value for boost modal' do + values = { 'setting_boost_modal' => '1' } + + settings.update(values) + expect(user.settings['boost_modal']).to eq true + end + + it 'updates the user settings value for gif auto play' do + values = { 'setting_auto_play_gif' => '0' } + + settings.update(values) + expect(user.settings['auto_play_gif']).to eq false + end + end +end -- cgit