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>2016-11-18 15:17:10 +0300
committerLin Jen-Shin <godfat@godfat.org>2016-11-18 15:17:10 +0300
commit9c4e0d64451bd76b829e1bb66afab892e19926da (patch)
tree7bcbfa45907119ab0039f696607fdf4e1557fb46 /spec/requests
parent688ff26df3f288e5cd50096a01014188a5e4011b (diff)
Use `Gitlab.config.gitlab.host` over `'localhost'`
This would fix long standing failures running tests on my development machine, which set `Gitlab.config.gitlab.host` to another host because it's not my local computer. Now I finally cannot withstand it and decided to fix them once and for all.
Diffstat (limited to 'spec/requests')
-rw-r--r--spec/requests/api/internal_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb
index 8f1a1f9e827..d91628807ef 100644
--- a/spec/requests/api/internal_spec.rb
+++ b/spec/requests/api/internal_spec.rb
@@ -406,7 +406,7 @@ describe API::API, api: true do
it 'returns link to create new merge request' do
expect(json_response).to match [{
"branch_name" => "new_branch",
- "url" => "http://localhost/#{project.namespace.name}/#{project.path}/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch",
+ "url" => "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch",
"new_merge_request" => true
}]
end