Add latest changes from gitlab-org/gitlab@13-3-stable-ee

1 files changed, 14 insertions, 4 deletions

diff --git a/spec/controllers/projects/prometheus/alerts_controller_spec.rb b/spec/controllers/projects/prometheus/alerts_controller_spec.rb
index 6e3148231bd..cbd599506df 100644
--- a/spec/controllers/projects/prometheus/alerts_controller_spec.rb
+++ b/spec/controllers/projects/prometheus/alerts_controller_spec.rb
@@ -111,6 +111,7 @@ RSpec.describe Projects::Prometheus::AlertsController do
   describe 'GET #show' do
     let(:alert) do
       create(:prometheus_alert,
+             :with_runbook_url,
              project: project,
              environment: environment,
              prometheus_metric: metric)
@@ -140,6 +141,7 @@ RSpec.describe Projects::Prometheus::AlertsController do
           'query' => alert.query,
           'operator' => alert.computed_operator,
           'threshold' => alert.threshold,
+          'runbook_url' => alert.runbook_url,
           'alert_path' => alert_path(alert)
         }
       end
@@ -225,7 +227,8 @@ RSpec.describe Projects::Prometheus::AlertsController do
         'title' => metric.title,
         'query' => metric.query,
         'operator' => '>',
-        'threshold' => 1.0
+        'threshold' => 1.0,
+        'runbook_url' => 'https://sample.runbook.com'
       }
     end
 
@@ -234,6 +237,7 @@ RSpec.describe Projects::Prometheus::AlertsController do
         opts,
         operator: '>',
         threshold: '1',
+        runbook_url: 'https://sample.runbook.com',
         environment_id: environment,
         prometheus_metric_id: metric
       )
@@ -250,14 +254,14 @@ RSpec.describe Projects::Prometheus::AlertsController do
       expect(json_response).to include(alert_params)
     end
 
-    it 'returns no_content for an invalid metric' do
+    it 'returns bad_request for an invalid metric' do
       make_request(prometheus_metric_id: 'invalid')
 
-      expect(response).to have_gitlab_http_status(:no_content)
+      expect(response).to have_gitlab_http_status(:bad_request)
     end
 
     it_behaves_like 'unprivileged'
-    it_behaves_like 'project non-specific environment', :no_content
+    it_behaves_like 'project non-specific environment', :bad_request
   end
 
   describe 'PUT #update' do
@@ -304,6 +308,12 @@ RSpec.describe Projects::Prometheus::AlertsController do
       expect(json_response).to include(alert_params)
     end
 
+    it 'returns bad_request for an invalid alert data' do
+      make_request(runbook_url: 'bad-url')
+
+      expect(response).to have_gitlab_http_status(:bad_request)
+    end
+
     it_behaves_like 'unprivileged'
     it_behaves_like 'project non-specific environment', :not_found
     it_behaves_like 'project non-specific metric', :not_found