diff options
author | Robert Speicher <robert@gitlab.com> | 2017-03-27 15:55:47 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-03-27 15:55:47 +0000 |
commit | aeff506a4ea247bd912de967e43dd34dd5fad453 (patch) | |
tree | 15b7747d3cc8ce1a9788a43c39252feb97738796 /spec/controllers | |
parent | 8bddf23e60459703b60d1c034ca155d5cd0e7536 (diff) | |
parent | c8ad3346b0d5575faab49f247192f58c92e1ce72 (diff) | |
download | gitlab-ce-aeff506a4ea247bd912de967e43dd34dd5fad453.tar.gz |
Merge branch 'sh-bring-back-option-to-be-notified-of-own-activity' into 'master'
Bring back option to be notified of own activity
See merge request !10032
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/profiles/notifications_controller_spec.rb | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/spec/controllers/profiles/notifications_controller_spec.rb b/spec/controllers/profiles/notifications_controller_spec.rb new file mode 100644 index 00000000000..b97cdd4d489 --- /dev/null +++ b/spec/controllers/profiles/notifications_controller_spec.rb @@ -0,0 +1,45 @@ +require 'spec_helper' + +describe Profiles::NotificationsController do + let(:user) do + create(:user) do |user| + user.emails.create(email: 'original@example.com') + user.emails.create(email: 'new@example.com') + user.notification_email = 'original@example.com' + user.save! + end + end + + describe 'GET show' do + it 'renders' do + sign_in(user) + + get :show + + expect(response).to render_template :show + end + end + + describe 'POST update' do + it 'updates only permitted attributes' do + sign_in(user) + + 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 + + it 'shows an error message if the params are invalid' do + sign_in(user) + + put :update, user: { notification_email: '' } + + expect(user.reload.notification_email).to eq('original@example.com') + expect(controller).to set_flash[:alert].to('Failed to save new settings') + end + end +end |