Allow custom ELASTIC_URL settings in tests

b76d5158 · Nick Thomas · 20ed6c30 · b76d5158
Commit b76d5158 authored Mar 01, 2017 by Nick Thomas
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

spec/support/webmock.rb spec/support/webmock.rb +9 -4

No files found.
--- a/spec/support/webmock.rb
+++ b/spec/support/webmock.rb
 require 'webmock'
 require 'webmock/rspec'
-WebMock.disable_net_connect!(
+allowed = %w[elasticsearch registry.gitlab.com-gitlab-org-test-elastic-image]
-  allow_localhost: true,
-  allow: ['elasticsearch', 'registry.gitlab.com-gitlab-org-test-elastic-image']
+if ENV.has_key?('ELASTIC_URL')
-)
+  url = URI.parse(ENV['ELASTIC_URL'])
+  allowed << url.host
+  allowed.uniq!
+end
+WebMock.disable_net_connect!(allow_localhost: true, allow: allowed)