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:
authorLin Jen-Shin <godfat@godfat.org>2017-05-26 16:55:29 +0300
committerLin Jen-Shin <godfat@godfat.org>2017-05-26 18:06:20 +0300
commitc94db0c2906c5da49acc9addb976b64fd7c7b256 (patch)
tree9db7628da93c0036625a48d985a1778a92a9766e /spec/controllers
parent70eb0c6a88ccb4a1d8fe6cc42fa4aa72b7584ffe (diff)
Use - as the prefix so we don't conflict with namespaces
The decision was made around: https://gitlab.com/gitlab-org/gitlab-ce/issues/26407#note_30624641
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/projects/environments_controller_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb
index 93d1ddb8836..de13f17012b 100644
--- a/spec/controllers/projects/environments_controller_spec.rb
+++ b/spec/controllers/projects/environments_controller_spec.rb
@@ -177,7 +177,7 @@ describe Projects::EnvironmentsController do
expect(response).to have_http_status(200)
expect(json_response).to eq(
{ 'redirect_url' =>
- "http://test.host/#{project.path_with_namespace}/jobs/#{action.id}" })
+ namespace_project_job_url(project.namespace, project, action) })
end
end
@@ -191,7 +191,7 @@ describe Projects::EnvironmentsController do
expect(response).to have_http_status(200)
expect(json_response).to eq(
{ 'redirect_url' =>
- "http://test.host/#{project.path_with_namespace}/environments/#{environment.id}" })
+ namespace_project_environment_url(project.namespace, project, environment) })
end
end
end