summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorRichard Macklin <richard.github@nrm.com>2017-01-27 01:31:53 -0800
committerRichard Macklin <richard.github@nrm.com>2017-02-01 11:31:21 -0800
commit0a0207ea91fdbe869ac70c23178b876bcbeb3021 (patch)
tree8c98cf62abc2ef06cbc26a4bb5f81b6dd947d83e /spec/controllers
parentbd03ca4a8e5b041f84db85f9043aaefd669afb82 (diff)
downloadgitlab-ce-0a0207ea91fdbe869ac70c23178b876bcbeb3021.tar.gz
Add notified_of_own_activity to permitted attributes
in Profiles::NotificationsController#update
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/profiles/notifications_controller_spec.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/controllers/profiles/notifications_controller_spec.rb b/spec/controllers/profiles/notifications_controller_spec.rb
index 55acc445e43..54324cece6c 100644
--- a/spec/controllers/profiles/notifications_controller_spec.rb
+++ b/spec/controllers/profiles/notifications_controller_spec.rb
@@ -16,10 +16,11 @@ describe Profiles::NotificationsController do
user = create_user
sign_in(user)
- put :update, user: { notification_email: 'new@example.com', admin: true }
+ put :update, user: { notification_email: 'new@example.com', notified_of_own_activity: true, admin: true }
user.reload
expect(user.notification_email).to eq('new@example.com')
+ expect(user.notified_of_own_activity).to eq(true)
expect(user.admin).to eq(false)
expect(controller).to set_flash[:notice].to('Notification settings saved')
end