Merge branch '353404-extract-draft-check' into 'master'

Extract draft status check to mergeability framework

See merge request gitlab-org/gitlab!82570

app/models/merge_request.rb

@@ -1153,7 +1153,6 @@ class MergeRequest < ApplicationRecord
   # rubocop: disable CodeReuse/ServiceClass
   def mergeable_state?(skip_ci_check: false, skip_discussions_check: false)
     return false unless open?
-    return false if work_in_progress?
 
     if Feature.enabled?(:improved_mergeability_checks, self.project, default_enabled: :yaml)
       additional_checks = MergeRequests::Mergeability::RunChecksService.new(
@@ -1165,6 +1164,7 @@ class MergeRequest < ApplicationRecord
       )
       additional_checks.execute.all?(&:success?)
     else
+      return false if draft?
       return false if broken?
       return false unless skip_discussions_check || mergeable_discussions_state?
       return false unless skip_ci_check || mergeable_ci_state?

app/services/merge_requests/mergeability/check_draft_status_service.rb

+# frozen_string_literal: true
+
+module MergeRequests
+  module Mergeability
+    class CheckDraftStatusService < CheckBaseService
+      def execute
+        if merge_request.draft?
+          failure
+        else
+          success
+        end
+      end
+
+      def skip?
+        false
+      end
+
+      def cacheable?
+        false
+      end
+    end
+  end
+end

app/services/merge_requests/mergeability/run_checks_service.rb

@@ -7,6 +7,7 @@ module MergeRequests
       # We want to have the cheapest checks first in the list,
       # that way we can fail fast before running the more expensive ones
       CHECKS = [
+        CheckDraftStatusService,
         CheckBrokenStatusService,
         CheckDiscussionsStatusService,
         CheckCiStatusService

spec/services/merge_requests/mergeability/check_draft_status_service_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe MergeRequests::Mergeability::CheckDraftStatusService do
+  subject(:check_draft_status) { described_class.new(merge_request: merge_request, params: {}) }
+
+  let(:merge_request) { build(:merge_request) }
+
+  describe '#execute' do
+    before do
+      expect(merge_request).to receive(:draft?).and_return(draft)
+    end
+
+    context 'when the merge request is a draft' do
+      let(:draft) { true }
+
+      it 'returns a check result with status failed' do
+        expect(check_draft_status.execute.status).to eq Gitlab::MergeRequests::Mergeability::CheckResult::FAILED_STATUS
+      end
+    end
+
+    context 'when the merge request is not a draft' do
+      let(:draft) { false }
+
+      it 'returns a check result with status success' do
+        expect(check_draft_status.execute.status).to eq Gitlab::MergeRequests::Mergeability::CheckResult::SUCCESS_STATUS
+      end
+    end
+  end
+
+  describe '#skip?' do
+    it 'returns false' do
+      expect(check_draft_status.skip?).to eq false
+    end
+  end
+
+  describe '#cacheable?' do
+    it 'returns false' do
+      expect(check_draft_status.cacheable?).to eq false
+    end
+  end
+end

spec/services/merge_requests/mergeability/run_checks_service_spec.rb

@@ -47,7 +47,7 @@ RSpec.describe MergeRequests::Mergeability::RunChecksService do
           expect(service).not_to receive(:execute)
         end
 
-        expect(execute).to match_array([success_result, success_result])
+        expect(execute).to match_array([success_result, success_result, success_result])
       end
     end