Fix specs
This commit is contained in:
parent
76b3e44c39
commit
72c552c2d4
|
@ -571,7 +571,7 @@ class Project < ActiveRecord::Base
|
|||
end
|
||||
|
||||
def http_url_to_repo
|
||||
[gitlab_config.url, '/', path_with_namespace, '.git'].join('')
|
||||
"#{web_url}.git"
|
||||
end
|
||||
|
||||
# Check if current branch name is marked as protected in the system
|
||||
|
|
|
@ -111,14 +111,20 @@ describe Project do
|
|||
expect(project.url_to_repo).to eq(Gitlab.config.gitlab_shell.ssh_path_prefix + 'somewhere.git')
|
||||
end
|
||||
|
||||
describe "#web_url" do
|
||||
let(:project) { create(:empty_project, path: "somewhere") }
|
||||
|
||||
it 'returns the full web URL for this repo' do
|
||||
project = Project.new(path: 'somewhere')
|
||||
expect(project.web_url).to eq("#{Gitlab.config.gitlab.url}/somewhere")
|
||||
expect(project.web_url).to eq("#{Gitlab.config.gitlab.url}/#{project.namespace.path}/somewhere")
|
||||
end
|
||||
end
|
||||
|
||||
describe "#web_url_without_protocol" do
|
||||
let(:project) { create(:empty_project, path: "somewhere") }
|
||||
|
||||
it 'returns the web URL without the protocol for this repo' do
|
||||
project = Project.new(path: 'somewhere')
|
||||
expect(project.web_url_without_protocol).to eq("#{Gitlab.config.gitlab.url.split('://')[1]}/somewhere")
|
||||
expect(project.web_url_without_protocol).to eq("#{Gitlab.config.gitlab.url.split('://')[1]}/#{project.namespace.path}/somewhere")
|
||||
end
|
||||
end
|
||||
|
||||
describe 'last_activity methods' do
|
||||
|
|
Loading…
Reference in New Issue