another fix and fixed spec
This commit is contained in:
parent
26b612258f
commit
48d76ecec8
|
@ -447,6 +447,8 @@ class Project < ActiveRecord::Base
|
|||
import_url = Gitlab::UrlSanitizer.new(value)
|
||||
create_or_update_import_data(credentials: import_url.credentials)
|
||||
super(import_url.sanitized_url)
|
||||
rescue Addressable::URI::InvalidURIError
|
||||
errors.add(:import_url, 'must be a valid URL.')
|
||||
end
|
||||
|
||||
def import_url
|
||||
|
|
|
@ -65,7 +65,14 @@ describe Project, models: true do
|
|||
end
|
||||
|
||||
it 'should not allow an invalid URI as import_url' do
|
||||
project2 = build(:project)
|
||||
project2 = build(:project, import_url: 'invalid://')
|
||||
|
||||
expect(project2).not_to be_valid
|
||||
end
|
||||
|
||||
it 'should allow a valid URI as import_url' do
|
||||
project2 = build(:project, import_url: 'ssh://test@gitlab.com/project.git')
|
||||
|
||||
expect(project2).to be_valid
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue