diff options
author | Rémy Coutable <remy@rymai.me> | 2016-07-11 07:53:13 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-07-11 07:53:13 +0000 |
commit | 11ba19e3d2ec5cef69bff1fdf12ee643012d6510 (patch) | |
tree | dede0f267f9b097a54de57c6ec57e5b62dac462c /spec | |
parent | b0b2301842682ba2e626cdc5b72d5e01a8662d2d (diff) | |
parent | 99f7b6d24684dcb9dbff79c8ff08f8c7580dcafe (diff) | |
download | gitlab-ce-11ba19e3d2ec5cef69bff1fdf12ee643012d6510.tar.gz |
Merge branch 'fix/remove-import-url-migration' into 'master'
Remove slow migration and add fix to sanitize errors
Getting rid of the slow migration and preventing the Error to occur
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19608
See merge request !5176
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lib/gitlab/url_sanitizer_spec.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/lib/gitlab/url_sanitizer_spec.rb b/spec/lib/gitlab/url_sanitizer_spec.rb index 59024d3290b..2cb74629da8 100644 --- a/spec/lib/gitlab/url_sanitizer_spec.rb +++ b/spec/lib/gitlab/url_sanitizer_spec.rb @@ -45,6 +45,12 @@ describe Gitlab::UrlSanitizer, lib: true do expect(filtered_content).to include("user@server:project.git") end + + it 'returns an empty string for invalid URLs' do + filtered_content = sanitize_url('ssh://') + + expect(filtered_content).to include("repository '' not found") + end end describe '#sanitized_url' do |