diff options
| author | James Lopez <james@jameslopez.es> | 2017-06-15 15:24:37 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2017-06-23 11:41:41 +0200 |
| commit | 04bb82c8b8cb3033c805ea5158b01c09284ac3db (patch) | |
| tree | 4cbf0d64425b8ff2ead9796b792f63dfc3d68051 | |
| parent | 949808529c3d7947279eb8ff89f9644fc8505550 (diff) | |
| download | gitlab-ce-04bb82c8b8cb3033c805ea5158b01c09284ac3db.tar.gz | |
update preferences controller
| -rw-r--r-- | app/controllers/profiles/preferences_controller.rb | 4 | ||||
| -rw-r--r-- | spec/controllers/profiles/preferences_controller_spec.rb | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app/controllers/profiles/preferences_controller.rb b/app/controllers/profiles/preferences_controller.rb index 5414142e2df..6845256e9d8 100644 --- a/app/controllers/profiles/preferences_controller.rb +++ b/app/controllers/profiles/preferences_controller.rb @@ -6,7 +6,9 @@ class Profiles::PreferencesController < Profiles::ApplicationController def update begin - if @user.update_attributes(preferences_params) + result = Users::UpdateService.new(current_user, user, preferences_params).execute + + if result[:status] == :success flash[:notice] = 'Preferences saved.' else flash[:alert] = 'Failed to save preferences.' diff --git a/spec/controllers/profiles/preferences_controller_spec.rb b/spec/controllers/profiles/preferences_controller_spec.rb index 7b3aa0491c7..a5f544b4f92 100644 --- a/spec/controllers/profiles/preferences_controller_spec.rb +++ b/spec/controllers/profiles/preferences_controller_spec.rb @@ -43,7 +43,8 @@ describe Profiles::PreferencesController do dashboard: 'stars' }.with_indifferent_access - expect(user).to receive(:update_attributes).with(prefs) + expect(user).to receive(:assign_attributes).with(prefs) + expect(user).to receive(:save) go params: prefs end @@ -51,7 +52,7 @@ describe Profiles::PreferencesController do context 'on failed update' do it 'sets the flash' do - expect(user).to receive(:update_attributes).and_return(false) + expect(user).to receive(:save).and_return(false) go |