summaryrefslogtreecommitdiff
path: root/spec/services/git_push_service_spec.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-11-18 17:46:44 +0000
committerRémy Coutable <remy@rymai.me>2016-11-18 17:46:44 +0000
commit03933cd279f0870a16f126619380ec386d68345a (patch)
treeb38581f3a13292be2c48eaeb99f8de7fd5b95770 /spec/services/git_push_service_spec.rb
parenta8a46e3d006bd06f2238b6487e1dad2f6f7d7dad (diff)
parent9c4e0d64451bd76b829e1bb66afab892e19926da (diff)
downloadgitlab-ce-03933cd279f0870a16f126619380ec386d68345a.tar.gz
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/services/git_push_service_spec.rb')
-rw-r--r--spec/services/git_push_service_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb
index a67e071341f..62f9982e840 100644
--- a/spec/services/git_push_service_spec.rb
+++ b/spec/services/git_push_service_spec.rb
@@ -490,7 +490,7 @@ describe GitPushService, services: true do
context "closing an issue" do
let(:message) { "this is some work.\n\ncloses JIRA-1" }
- let(:comment_body) { { body: "Issue solved with [#{closing_commit.id}|http://localhost/#{project.path_with_namespace}/commit/#{closing_commit.id}]." }.to_json }
+ let(:comment_body) { { body: "Issue solved with [#{closing_commit.id}|http://#{Gitlab.config.gitlab.host}/#{project.path_with_namespace}/commit/#{closing_commit.id}]." }.to_json }
before do
open_issue = JIRA::Resource::Issue.new(jira_tracker.client, attrs: { "id" => "JIRA-1" })