summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-05-05 13:50:03 +0000
committerRobert Speicher <robert@gitlab.com>2017-05-05 13:50:03 +0000
commit10c1bf2d77fd0ab21309d0b136cbc0ac11f56c77 (patch)
treeb171476c60bec5cacffbf1b65b09f83c8d6ce44f /spec/models
parentfaf2ce89cd4eafdccb78823cf1a32c338a8d9a79 (diff)
parent6eb9e981c61969a904ccbae2c5f52f562b02d199 (diff)
downloadgitlab-ce-10c1bf2d77fd0ab21309d0b136cbc0ac11f56c77.tar.gz
Merge branch 'prometheus-integration-test-setting-fix' into 'master'
Added rescue block for the test method for the prometheus service Closes #31451 See merge request !10994
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/project_services/prometheus_service_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/project_services/prometheus_service_spec.rb b/spec/models/project_services/prometheus_service_spec.rb
index d15079b686b..f3126bc1e57 100644
--- a/spec/models/project_services/prometheus_service_spec.rb
+++ b/spec/models/project_services/prometheus_service_spec.rb
@@ -94,7 +94,7 @@ describe PrometheusService, models: true, caching: true do
[404, 500].each do |status|
context "when Prometheus responds with #{status}" do
before do
- stub_all_prometheus_requests(environment.slug, status: status, body: 'QUERY FAILED!')
+ stub_all_prometheus_requests(environment.slug, status: status, body: "QUERY FAILED!")
end
it { is_expected.to eq(success: false, result: %(#{status} - "QUERY FAILED!")) }