diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-07-26 12:36:03 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-07-26 12:36:03 +0000 |
| commit | 5f35901a01ff822ba1e637251d9726a41e73ed17 (patch) | |
| tree | 75a442f865c9a3bfa219ffcf27a6d2eb23dc1769 | |
| parent | 549d2cc8d0a29ba7c3b54e15974ab44a76418f59 (diff) | |
| parent | c4854426654949feef4085fd3026d5862f00aa7c (diff) | |
| download | gitlab-ce-5f35901a01ff822ba1e637251d9726a41e73ed17.tar.gz | |
Merge branch 'mk-fix-master-wiki-web-url-spec' into 'master'
Fix project wiki web_url spec
See merge request !13105
| -rw-r--r-- | spec/models/project_wiki_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/project_wiki_spec.rb b/spec/models/project_wiki_spec.rb index 1f314791479..79ab50c1234 100644 --- a/spec/models/project_wiki_spec.rb +++ b/spec/models/project_wiki_spec.rb @@ -21,7 +21,7 @@ describe ProjectWiki, models: true do describe '#web_url' do it 'returns the full web URL to the wiki' do - expect(subject.web_url).to eq("#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/wikis/home") + expect(subject.web_url).to match("https?://[^\/]+/#{project.path_with_namespace}/wikis/home") end end |