refactors tests because of gitlab-test repository changes

1 files changed, 14 insertions, 1 deletions

diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 6dd3f91be17..4df78713a82 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -114,17 +114,30 @@ describe Repository, models: true do
   end
 
   describe '#merged_to_root_ref?' do
-    context 'merged branch' do
+    context 'merged branch without ff' do
       subject { repository.merged_to_root_ref?('branch-merged') }
 
       it { is_expected.to be_truthy }
     end
 
+    # If the HEAD was ff then it will be false
+    context 'merged with ff' do
+      subject { repository.merged_to_root_ref?('improve/awesome') }
+
+      it { is_expected.to be_truthy }
+    end
+
     context 'not merged branch' do
       subject { repository.merged_to_root_ref?('not-merged-branch') }
 
       it { is_expected.to be_falsey }
     end
+
+    context 'default branch' do
+      subject { repository.merged_to_root_ref?('master') }
+
+      it { is_expected.to be_falsey }
+    end
   end
 
   describe '#can_be_merged?' do