Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-02-08 19:54:12 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-02-08 19:54:12 +0300
commit9104dda057cc7f2c65f07e509013f3cff10db590 (patch)
tree74af16bfb1bc2afc23fb385727fda39b0f211862 /spec/support/shared_examples
parent2b77b43bec240eb5ed2c5422eb810df5eb8edfcc (diff)
Add latest changes from gitlab-org/gitlab@14-7-stable-ee
Diffstat (limited to 'spec/support/shared_examples')
-rw-r--r--spec/support/shared_examples/models/clusters/elastic_stack_client_shared.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/shared_examples/models/clusters/elastic_stack_client_shared.rb b/spec/support/shared_examples/models/clusters/elastic_stack_client_shared.rb
index d3ce916cd64..744262d79ea 100644
--- a/spec/support/shared_examples/models/clusters/elastic_stack_client_shared.rb
+++ b/spec/support/shared_examples/models/clusters/elastic_stack_client_shared.rb
@@ -47,7 +47,7 @@ RSpec.shared_examples 'cluster-based #elasticsearch_client' do |factory|
it 'copies proxy_url, options and headers from kube client to elasticsearch_client' do
expect(Elasticsearch::Client)
.to(receive(:new))
- .with(url: a_valid_url)
+ .with(url: a_valid_url, adapter: :net_http)
.and_call_original
client = subject.elasticsearch_client