Add latest changes from gitlab-org/gitlab@master

1 files changed, 15 insertions, 1 deletions

diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 10220448936..3f5f0858178 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -424,8 +424,9 @@ RSpec.describe Project, factory_default: :keep do
       end
 
       include_context 'invalid urls'
+      include_context 'valid urls with CRLF'
 
-      it 'does not allow urls with CR or LF characters' do
+      it 'does not allow URLs with unencoded CR or LF characters' do
         project = build(:project)
 
         aggregate_failures do
@@ -437,6 +438,19 @@ RSpec.describe Project, factory_default: :keep do
           end
         end
       end
+
+      it 'allow URLs with CR or LF characters' do
+        project = build(:project)
+
+        aggregate_failures do
+          valid_urls_with_CRLF.each do |url|
+            project.import_url = url
+
+            expect(project).to be_valid
+            expect(project.errors).to be_empty
+          end
+        end
+      end
     end
 
     describe 'project pending deletion' do