Fix satellite tests

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb
index 80dbd2f429b..3319262c015 100644
--- a/spec/factories/merge_requests.rb
+++ b/spec/factories/merge_requests.rb
@@ -11,6 +11,9 @@ FactoryGirl.define do
     # 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9 More submodules
     # d14d6c0abdd253381df51a723d58691b2ee1ab08 Remove ds_store files
     # c1acaa58bbcbc3eafe538cb8274ba387047b69f8 Ignore DS files
+    #
+    # See also RepoHelpers.sample_compare
+    #
     source_branch "master"
     target_branch "feature"
 
@@ -19,6 +22,11 @@ FactoryGirl.define do
     trait :with_diffs do
     end
 
+    trait :conflict do
+      source_branch "feature_conflict"
+      target_branch "feature"
+    end
+
     trait :closed do
       state :closed
     end