From 903ccf7c93eb9490c76857bffe744249cc07de09 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 7 Apr 2020 12:09:34 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/models/project_services/prometheus_service_spec.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'spec/models') diff --git a/spec/models/project_services/prometheus_service_spec.rb b/spec/models/project_services/prometheus_service_spec.rb index 297411f7980..f663f0ab7cb 100644 --- a/spec/models/project_services/prometheus_service_spec.rb +++ b/spec/models/project_services/prometheus_service_spec.rb @@ -48,6 +48,18 @@ describe PrometheusService, :use_clean_rails_memory_store_caching do it 'does not validate presence of api_url' do expect(service).not_to validate_presence_of(:api_url) + expect(service.valid?).to eq(true) + end + + context 'local connections allowed' do + before do + stub_application_setting(allow_local_requests_from_web_hooks_and_services: true) + end + + it 'does not validate presence of api_url' do + expect(service).not_to validate_presence_of(:api_url) + expect(service.valid?).to eq(true) + end end end -- cgit v1.2.3