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/models/project_services | |
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/models/project_services')
-rw-r--r-- | spec/models/project_services/gitlab_issue_tracker_service_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/models/project_services/gitlab_issue_tracker_service_spec.rb b/spec/models/project_services/gitlab_issue_tracker_service_spec.rb index 652804fb444..9b80f0e7296 100644 --- a/spec/models/project_services/gitlab_issue_tracker_service_spec.rb +++ b/spec/models/project_services/gitlab_issue_tracker_service_spec.rb @@ -35,9 +35,9 @@ describe GitlabIssueTrackerService, models: true do end it 'gives the correct path' do - expect(@service.project_url).to eq("http://localhost/gitlab/root/#{project.path_with_namespace}/issues") - expect(@service.new_issue_url).to eq("http://localhost/gitlab/root/#{project.path_with_namespace}/issues/new") - expect(@service.issue_url(432)).to eq("http://localhost/gitlab/root/#{project.path_with_namespace}/issues/432") + expect(@service.project_url).to eq("http://#{Gitlab.config.gitlab.host}/gitlab/root/#{project.path_with_namespace}/issues") + expect(@service.new_issue_url).to eq("http://#{Gitlab.config.gitlab.host}/gitlab/root/#{project.path_with_namespace}/issues/new") + expect(@service.issue_url(432)).to eq("http://#{Gitlab.config.gitlab.host}/gitlab/root/#{project.path_with_namespace}/issues/432") end end |