Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-06-26 14:42:44 +0300
committerSean McGivern <sean@mcgivern.me.uk>2017-06-26 14:42:44 +0300
commitbff82b784bac7af8cf3a3d8b49fa10ebd1ef67f0 (patch)
tree2b294a4f5f947843ea6afdb8f31338e2901f5e8f /spec/controllers/profiles/preferences_controller_spec.rb
parent739a03a825e5c04c7566bc3bb26314b049e403ec (diff)
parent4d70c479107fc502668a83fc369159062d8efbb8 (diff)
Merge branch 'feature/add-new-services' into 'master'
Add additional user and email services See merge request !12125
Diffstat (limited to 'spec/controllers/profiles/preferences_controller_spec.rb')
-rw-r--r--spec/controllers/profiles/preferences_controller_spec.rb5
1 files changed, 3 insertions, 2 deletions
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