summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/environments
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-29 07:12:44 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-29 07:12:44 +0000
commit6a4f265c940d3d0a9aeacf09222920d7d2cc4e45 (patch)
tree4cf73897e78f8fee50e39edb7d74fa628b6a87da /spec/controllers/projects/environments
parentcba453953c1598f83b2ed72bc012b65e0df5b767 (diff)
downloadgitlab-ce-6a4f265c940d3d0a9aeacf09222920d7d2cc4e45.tar.gz
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'spec/controllers/projects/environments')
-rw-r--r--spec/controllers/projects/environments/prometheus_api_controller_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/projects/environments/prometheus_api_controller_spec.rb b/spec/controllers/projects/environments/prometheus_api_controller_spec.rb
index 64f90e44bb6..fb8da52930c 100644
--- a/spec/controllers/projects/environments/prometheus_api_controller_spec.rb
+++ b/spec/controllers/projects/environments/prometheus_api_controller_spec.rb
@@ -84,12 +84,12 @@ describe Projects::Environments::PrometheusApiController do
before do
expected_params[:query] = %{up{pod_name="#{pod_name}"}}
- expected_params[:variables] = ['pod_name', pod_name]
+ expected_params[:variables] = { 'pod_name' => pod_name }
end
it 'replaces variables with values' do
get :proxy, params: environment_params.merge(
- query: 'up{pod_name="{{pod_name}}"}', variables: ['pod_name', pod_name]
+ query: 'up{pod_name="{{pod_name}}"}', variables: { 'pod_name' => pod_name }
)
expect(response).to have_gitlab_http_status(:success)