Add latest changes from gitlab-org/gitlab@12-10-stable-ee

1 files changed, 10 insertions, 0 deletions

diff --git a/spec/factories/diff_position.rb b/spec/factories/diff_position.rb
index a43c5afdff4..685272acf5c 100644
--- a/spec/factories/diff_position.rb
+++ b/spec/factories/diff_position.rb
@@ -34,10 +34,20 @@ FactoryBot.define do
       position_type { 'text' }
       old_line { 10 }
       new_line { 10 }
+      line_range { nil }
 
       trait :added do
         old_line { nil }
       end
+
+      trait :multi_line do
+        line_range do
+          {
+            start_line_code: Gitlab::Git.diff_line_code(file, 10, 10),
+            end_line_code: Gitlab::Git.diff_line_code(file, 12, 13)
+          }
+        end
+      end
     end
 
     factory :image_diff_position do