diff options
author | Rémy Coutable <remy@rymai.me> | 2017-03-20 10:56:43 +0100 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-03-20 16:24:01 +0100 |
commit | be25bbc4d2c7e3d5cf3da6f51cb7f7355295ef52 (patch) | |
tree | 4f89c264978be7e93ea7a189e8dbbdca3439babe /spec/models/project_wiki_spec.rb | |
parent | cd3e410110a5c6f33c5e873f8fb54883a8e11754 (diff) | |
download | gitlab-ce-be25bbc4d2c7e3d5cf3da6f51cb7f7355295ef52.tar.gz |
Fix ProjectWiki#http_url_to_repo signature
New Gitlab::UrlSanitizer.http_credentials_for_user method responsible
for generating a credentials hash from a user.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec/models/project_wiki_spec.rb')
-rw-r--r-- | spec/models/project_wiki_spec.rb | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/spec/models/project_wiki_spec.rb b/spec/models/project_wiki_spec.rb index 58b57bd4fef..b5b9cd024b0 100644 --- a/spec/models/project_wiki_spec.rb +++ b/spec/models/project_wiki_spec.rb @@ -35,10 +35,23 @@ describe ProjectWiki, models: true do end describe "#http_url_to_repo" do - it "provides the full http url to the repo" do - gitlab_url = Gitlab.config.gitlab.url - repo_http_url = "#{gitlab_url}/#{subject.path_with_namespace}.git" - expect(subject.http_url_to_repo).to eq(repo_http_url) + let(:project) { create :empty_project } + + context 'when no user is given' do + it 'returns the url to the repo without a username' do + expected_url = "#{Gitlab.config.gitlab.url}/#{subject.path_with_namespace}.git" + + expect(project_wiki.http_url_to_repo).to eq(expected_url) + expect(project_wiki.http_url_to_repo).not_to include('@') + end + end + + context 'when user is given' do + it 'returns the url to the repo with the username' do + user = build_stubbed(:user) + + expect(project_wiki.http_url_to_repo(user)).to start_with("http://#{user.username}@") + end end end |