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>2020-05-13 03:07:50 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-13 03:07:50 +0300
commit8dc1e72e2b5cb6112d5468194580edb186de4659 (patch)
treef77ab94b3a74dcb06c97ce1ea54a6f89eaeb26bf /spec/services/pod_logs/elasticsearch_service_spec.rb
parent0df696c5f77936ecae5ea3c3f17b3e885d7dea0b (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/pod_logs/elasticsearch_service_spec.rb')
-rw-r--r--spec/services/pod_logs/elasticsearch_service_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/pod_logs/elasticsearch_service_spec.rb b/spec/services/pod_logs/elasticsearch_service_spec.rb
index c5a691f2254..8060d07461a 100644
--- a/spec/services/pod_logs/elasticsearch_service_spec.rb
+++ b/spec/services/pod_logs/elasticsearch_service_spec.rb
@@ -255,7 +255,7 @@ describe ::PodLogs::ElasticsearchService do
.and_return(Elasticsearch::Transport::Client.new)
allow_any_instance_of(::Gitlab::Elasticsearch::Logs::Lines)
.to receive(:pod_logs)
- .with(namespace, pod_name: pod_name, container_name: container_name, search: search, start_time: start_time, end_time: end_time, cursor: cursor, filebeat7: true)
+ .with(namespace, pod_name: pod_name, container_name: container_name, search: search, start_time: start_time, end_time: end_time, cursor: cursor, chart_above_v2: true)
.and_return({ logs: expected_logs, cursor: expected_cursor })
result = subject.send(:pod_logs, result_arg)