BigW Consortium Gitlab

Commit 48d76ece by James Lopez

another fix and fixed spec

parent 26b61225
...@@ -447,6 +447,8 @@ class Project < ActiveRecord::Base ...@@ -447,6 +447,8 @@ class Project < ActiveRecord::Base
import_url = Gitlab::UrlSanitizer.new(value) import_url = Gitlab::UrlSanitizer.new(value)
create_or_update_import_data(credentials: import_url.credentials) create_or_update_import_data(credentials: import_url.credentials)
super(import_url.sanitized_url) super(import_url.sanitized_url)
rescue Addressable::URI::InvalidURIError
errors.add(:import_url, 'must be a valid URL.')
end end
def import_url def import_url
......
...@@ -65,7 +65,14 @@ describe Project, models: true do ...@@ -65,7 +65,14 @@ describe Project, models: true do
end end
it 'should not allow an invalid URI as import_url' do 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 expect(project2).to be_valid
end end
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment