kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Use environment_params when defining expected_params

Browse source
This commit is contained in:
rpereira2 2019-04-04 19:16:45 +05:30
parent 3888b4d35c
commit 20594de8cc
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
spec/controllers/projects/environments/prometheus_api_controller_spec.rb
View file

@ -16,13 +16,11 @@ describe Projects::Environments::PrometheusApiController do
let(:prometheus_proxy_service) { instance_double(Prometheus::ProxyService) } let(:prometheus_proxy_service) { instance_double(Prometheus::ProxyService) }
let(:expected_params) do let(:expected_params) do
ActionController::Parameters.new( ActionController::Parameters.new(
"query" => "1", environment_params(
"id" => environment.id.to_s, proxy_path: 'query',
"namespace_id" => project.namespace.name, controller: 'projects/environments/prometheus_api',
"project_id" => project.name, action: 'proxy'
"proxy_path" => "query", )
"controller" => "projects/environments/prometheus_api",
"action" => "proxy"
).permit! ).permit!
end end
@ -144,9 +142,9 @@ describe Projects::Environments::PrometheusApiController do
def environment_params(params = {}) def environment_params(params = {})
{ {
id: environment.id, id: environment.id.to_s,
namespace_id: project.namespace, namespace_id: project.namespace.name,
project_id: project, project_id: project.name,
proxy_path: 'query', proxy_path: 'query',
query: '1' query: '1'
}.merge(params) }.merge(params)