Merge branch 'ph/fixBlockingMergeRequests' into 'master'

Fix blocking merge requests not unblocking merge button

See merge request gitlab-org/gitlab!82483

ee/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js

@@ -36,7 +36,10 @@ export default {
         return this.restructuredWidgetShowMergeButtons;
       }
 
-      if (this.mr.blockingMergeRequests?.total_count > 0) {
+      if (
+        (this.mr.blockingMergeRequests?.visible_merge_requests?.merged?.length || 0) !==
+        (this.mr.blockingMergeRequests?.total_count || 0)
+      ) {
         return false;
       }
 

ee/spec/features/merge_request/merge_request_widget_blocking_mrs_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe "User views merge request with blocking merge requests", :js do
+  let(:merge_request) { create(:merge_request) }
+  let(:user) { merge_request.target_project.first_owner }
+
+  let(:other_mr) { create(:merge_request) }
+
+  before do
+    stub_licensed_features(blocking_merge_requests: true)
+
+    other_mr.target_project.team.add_developer(user)
+    create(:merge_request_block, blocking_merge_request: other_mr, blocked_merge_request: merge_request)
+
+    sign_in(user)
+
+    visit merge_request_path(merge_request)
+  end
+
+  it 'disables merge button when blocking merge request is open' do
+    page.within('.mr-widget-section') do
+      expect(page).to have_content('Merge blocked: all merge request dependencies must be merged or closed.')
+    end
+  end
+
+  context 'merged blocking merge request' do
+    let(:other_mr) { create(:merge_request, state: :merged) }
+
+    it 'enables merge button when blocking merge request is merged' do
+      page.within('.mr-widget-section') do
+        expect(page).not_to have_content('Merge blocked: all merge request dependencies must be merged or closed.')
+      end
+    end
+  end
+end

ee/spec/frontend/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js

@@ -375,17 +375,18 @@ describe('ReadyToMerge', () => {
       });
 
       it.each`
-        disabled     | disabledText | totalCount
-        ${'true'}    | ${'disable'} | ${1}
-        ${undefined} | ${'enable'}  | ${0}
+        disabled     | disabledText | totalCount | mergedCount
+        ${'true'}    | ${'disable'} | ${1}       | ${0}
+        ${undefined} | ${'enable'}  | ${1}       | ${1}
       `(
-        'should $disabledText merge button blockingMergeRequests.total_count is $totalCount',
-        ({ disabled, totalCount }) => {
+        'should $disabledText merge button blockingMergeRequests.total_count is $totalCount and merged is $mergedCount',
+        ({ disabled, totalCount, mergedCount }) => {
           factory({
             isMergeAllowed: true,
             availableAutoMergeStrategies: [],
             blockingMergeRequests: {
               total_count: totalCount,
+              visible_merge_requests: { merged: new Array(mergedCount) },
             },
           });