diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-11-18 17:46:44 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-18 17:46:44 +0000 |
| commit | 03933cd279f0870a16f126619380ec386d68345a (patch) | |
| tree | b38581f3a13292be2c48eaeb99f8de7fd5b95770 /spec/lib | |
| parent | a8a46e3d006bd06f2238b6487e1dad2f6f7d7dad (diff) | |
| parent | 9c4e0d64451bd76b829e1bb66afab892e19926da (diff) | |
| download | gitlab-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/lib')
| -rw-r--r-- | spec/lib/gitlab/middleware/go_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/middleware/go_spec.rb b/spec/lib/gitlab/middleware/go_spec.rb index 117a15264da..fd3769d75b5 100644 --- a/spec/lib/gitlab/middleware/go_spec.rb +++ b/spec/lib/gitlab/middleware/go_spec.rb @@ -22,7 +22,7 @@ describe Gitlab::Middleware::Go, lib: true do resp = middleware.call(env) expect(resp[0]).to eq(200) expect(resp[1]['Content-Type']).to eq('text/html') - expected_body = "<!DOCTYPE html><html><head><meta content='localhost/group/project git http://localhost/group/project.git' name='go-import'></head></html>\n" + expected_body = "<!DOCTYPE html><html><head><meta content='#{Gitlab.config.gitlab.host}/group/project git http://#{Gitlab.config.gitlab.host}/group/project.git' name='go-import'></head></html>\n" expect(resp[2].body).to eq([expected_body]) end end |