diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-11-18 20:46:44 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-18 20:46:44 +0300 |
| commit | 03933cd279f0870a16f126619380ec386d68345a (patch) | |
| tree | b38581f3a13292be2c48eaeb99f8de7fd5b95770 /spec/requests | |
| parent | a8a46e3d006bd06f2238b6487e1dad2f6f7d7dad (diff) | |
| parent | 9c4e0d64451bd76b829e1bb66afab892e19926da (diff) | |
Merge branch 'fix-tests-for-different-host' into 'master'
Use `Gitlab.config.gitlab.host` over `'localhost'`
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.
See merge request !7562
Diffstat (limited to 'spec/requests')
| -rw-r--r-- | spec/requests/api/internal_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb index 03796f20e36..e88a7e27d45 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 |