Refactor squash and merge parts of MergeRequest into an EE module

app/models/ee/merge_request.rb

+module EE
+  module MergeRequest
+    def ff_merge_possible?
+      project.repository.is_ancestor?(target_branch_sha, diff_head_sha)
+    end
+
+    def should_be_rebased?
+      self.project.ff_merge_must_be_possible? && !ff_merge_possible?
+    end
+
+    def rebase_dir_path
+      File.join(::Gitlab.config.shared.path, 'tmp/rebase', source_project.id.to_s, id.to_s).to_s
+    end
+
+    def squash_dir_path
+      File.join(::Gitlab.config.shared.path, 'tmp/squash', source_project.id.to_s, id.to_s).to_s
+    end
+
+    def rebase_in_progress?
+      # The source project can be deleted
+      return false unless source_project
+
+      File.exist?(rebase_dir_path) && !clean_stuck_rebase
+    end
+
+    def squash_in_progress?
+      # The source project can be deleted
+      return false unless source_project
+
+      File.exist?(squash_dir_path) && !clean_stuck_squash
+    end
+
+    def clean_stuck_rebase
+      if File.mtime(rebase_dir_path) < 15.minutes.ago
+        FileUtils.rm_rf(rebase_dir_path)
+        true
+      end
+    end
+
+    def clean_stuck_squash
+      if File.mtime(squash_dir_path) < 15.minutes.ago
+        FileUtils.rm_rf(squash_dir_path)
+        true
+      end
+    end
+  end
+end

app/models/merge_request.rb

@@ -10,6 +10,8 @@ class MergeRequest < ActiveRecord::Base
 
   ignore_column :position
 
+  include ::EE::MergeRequest
+
   belongs_to :target_project, class_name: "Project"
   belongs_to :source_project, class_name: "Project"
   belongs_to :merge_user, class_name: "User"
@@ -820,50 +822,6 @@ class MergeRequest < ActiveRecord::Base
     end
   end
 
-  def ff_merge_possible?
-    project.repository.is_ancestor?(target_branch_sha, diff_head_sha)
-  end
-
-  def should_be_rebased?
-    self.project.ff_merge_must_be_possible? && !ff_merge_possible?
-  end
-
-  def rebase_dir_path
-    File.join(Gitlab.config.shared.path, 'tmp/rebase', source_project.id.to_s, id.to_s).to_s
-  end
-
-  def squash_dir_path
-    File.join(Gitlab.config.shared.path, 'tmp/squash', source_project.id.to_s, id.to_s).to_s
-  end
-
-  def rebase_in_progress?
-    # The source project can be deleted
-    return false unless source_project
-
-    File.exist?(rebase_dir_path) && !clean_stuck_rebase
-  end
-
-  def clean_stuck_rebase
-    if File.mtime(rebase_dir_path) < 15.minutes.ago
-      FileUtils.rm_rf(rebase_dir_path)
-      true
-    end
-  end
-
-  def squash_in_progress?
-    # The source project can be deleted
-    return false unless source_project
-
-    File.exist?(squash_dir_path) && !clean_stuck_squash
-  end
-
-  def clean_stuck_squash
-    if File.mtime(squash_dir_path) < 15.minutes.ago
-      FileUtils.rm_rf(squash_dir_path)
-      true
-    end
-  end
-
   def diverged_commits_count
     cache = Rails.cache.read(:"merge_request_#{id}_diverged_commits")
 

spec/models/ee/merge_request_spec.rb

+require 'spec_helper'
+
+describe MergeRequest, models: true do
+  subject { create(:merge_request) }
+
+  describe '#rebase_in_progress?' do
+    it 'returns true when there is a current rebase directory' do
+      allow(File).to receive(:exist?).and_return(true)
+      allow(File).to receive(:mtime).and_return(Time.now)
+
+      expect(subject.rebase_in_progress?).to be_truthy
+    end
+
+    it 'returns false when there is no rebase directory' do
+      allow(File).to receive(:exist?).with(subject.rebase_dir_path).and_return(false)
+
+      expect(subject.rebase_in_progress?).to be_falsey
+    end
+
+    it 'returns false when the rebase directory has expired' do
+      allow(File).to receive(:exist?).and_return(true)
+      allow(File).to receive(:mtime).and_return(20.minutes.ago)
+
+      expect(subject.rebase_in_progress?).to be_falsey
+    end
+
+    it 'returns false when the source project has been removed' do
+      allow(subject).to receive(:source_project).and_return(nil)
+      allow(File).to receive(:exist?).and_return(true)
+      allow(File).to receive(:mtime).and_return(Time.now)
+
+      expect(File).not_to have_received(:exist?)
+      expect(subject.rebase_in_progress?).to be_falsey
+    end
+  end
+
+  describe '#squash_in_progress?' do
+    it 'returns true when there is a current squash directory' do
+      allow(File).to receive(:exist?).and_return(true)
+      allow(File).to receive(:mtime).and_return(Time.now)
+
+      expect(subject.squash_in_progress?).to be_truthy
+    end
+
+    it 'returns false when there is no squash directory' do
+      allow(File).to receive(:exist?).with(subject.squash_dir_path).and_return(false)
+
+      expect(subject.squash_in_progress?).to be_falsey
+    end
+
+    it 'returns false when the squash directory has expired' do
+      allow(File).to receive(:exist?).and_return(true)
+      allow(File).to receive(:mtime).and_return(20.minutes.ago)
+
+      expect(subject.squash_in_progress?).to be_falsey
+    end
+
+    it 'returns false when the source project has been removed' do
+      allow(subject).to receive(:source_project).and_return(nil)
+      allow(File).to receive(:exist?).and_return(true)
+      allow(File).to receive(:mtime).and_return(Time.now)
+
+      expect(File).not_to have_received(:exist?)
+      expect(subject.squash_in_progress?).to be_falsey
+    end
+  end
+end

spec/models/merge_request_spec.rb

@@ -913,68 +913,6 @@ describe MergeRequest, models: true do
     subject { create :merge_request, :simple }
   end
 
-  describe '#rebase_in_progress?' do
-    it 'returns true when there is a current rebase directory' do
-      allow(File).to receive(:exist?).and_return(true)
-      allow(File).to receive(:mtime).and_return(Time.now)
-
-      expect(subject.rebase_in_progress?).to be_truthy
-    end
-
-    it 'returns false when there is no rebase directory' do
-      allow(File).to receive(:exist?).with(subject.rebase_dir_path).and_return(false)
-
-      expect(subject.rebase_in_progress?).to be_falsey
-    end
-
-    it 'returns false when the rebase directory has expired' do
-      allow(File).to receive(:exist?).and_return(true)
-      allow(File).to receive(:mtime).and_return(20.minutes.ago)
-
-      expect(subject.rebase_in_progress?).to be_falsey
-    end
-
-    it 'returns false when the source project has been removed' do
-      allow(subject).to receive(:source_project).and_return(nil)
-      allow(File).to receive(:exist?).and_return(true)
-      allow(File).to receive(:mtime).and_return(Time.now)
-
-      expect(File).not_to have_received(:exist?)
-      expect(subject.rebase_in_progress?).to be_falsey
-    end
-  end
-
-  describe '#squash_in_progress?' do
-    it 'returns true when there is a current squash directory' do
-      allow(File).to receive(:exist?).and_return(true)
-      allow(File).to receive(:mtime).and_return(Time.now)
-
-      expect(subject.squash_in_progress?).to be_truthy
-    end
-
-    it 'returns false when there is no squash directory' do
-      allow(File).to receive(:exist?).with(subject.squash_dir_path).and_return(false)
-
-      expect(subject.squash_in_progress?).to be_falsey
-    end
-
-    it 'returns false when the squash directory has expired' do
-      allow(File).to receive(:exist?).and_return(true)
-      allow(File).to receive(:mtime).and_return(20.minutes.ago)
-
-      expect(subject.squash_in_progress?).to be_falsey
-    end
-
-    it 'returns false when the source project has been removed' do
-      allow(subject).to receive(:source_project).and_return(nil)
-      allow(File).to receive(:exist?).and_return(true)
-      allow(File).to receive(:mtime).and_return(Time.now)
-
-      expect(File).not_to have_received(:exist?)
-      expect(subject.squash_in_progress?).to be_falsey
-    end
-  end
-
   describe '#commits_sha' do
     before do
       allow(subject.merge_request_diff).to receive(:commits_sha)