diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 21:08:05 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 21:08:05 +0000 |
commit | abae8f34f377519946a91101ef7abf504454531c (patch) | |
tree | 359fab0082860b6850d4a0a492b8f12eb3d4eb0b /spec/controllers/notification_settings_controller_spec.rb | |
parent | 580622bdb3c762a8e89facd8a3946881ee480442 (diff) | |
download | gitlab-ce-abae8f34f377519946a91101ef7abf504454531c.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/notification_settings_controller_spec.rb')
-rw-r--r-- | spec/controllers/notification_settings_controller_spec.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/controllers/notification_settings_controller_spec.rb b/spec/controllers/notification_settings_controller_spec.rb index 7b19c67cad3..f3b608aee0c 100644 --- a/spec/controllers/notification_settings_controller_spec.rb +++ b/spec/controllers/notification_settings_controller_spec.rb @@ -50,7 +50,7 @@ describe NotificationSettingsController do notification_setting: { level: :participating } } - expect(response.status).to eq 200 + expect(response).to have_gitlab_http_status(:ok) expect(notification_setting.level).to eq("participating") expect(notification_setting.user_id).to eq(user.id) expect(notification_setting.source_id).to eq(project.id) @@ -65,7 +65,7 @@ describe NotificationSettingsController do notification_setting: { level: :custom }.merge(custom_events) } - expect(response.status).to eq 200 + expect(response).to have_gitlab_http_status(:ok) expect(notification_setting.level).to eq("custom") custom_events.each do |event, value| @@ -85,7 +85,7 @@ describe NotificationSettingsController do notification_setting: { level: :watch } } - expect(response.status).to eq 200 + expect(response).to have_gitlab_http_status(:ok) expect(notification_setting.level).to eq("watch") expect(notification_setting.user_id).to eq(user.id) expect(notification_setting.source_id).to eq(group.id) @@ -100,7 +100,7 @@ describe NotificationSettingsController do notification_setting: { level: :custom }.merge(custom_events) } - expect(response.status).to eq 200 + expect(response).to have_gitlab_http_status(:ok) expect(notification_setting.level).to eq("custom") custom_events.each do |event, value| @@ -157,7 +157,7 @@ describe NotificationSettingsController do notification_setting: { level: :participating } } - expect(response.status).to eq 200 + expect(response).to have_gitlab_http_status(:ok) end context 'and setting custom notification setting' do @@ -176,7 +176,7 @@ describe NotificationSettingsController do notification_setting: { level: :participating, events: custom_events } } - expect(response.status).to eq 200 + expect(response).to have_gitlab_http_status(:ok) end end end |