Merge branch '323061-aqualls-resolve-threads' into 'master'

Initial fix to "all threads must be resolved"

See merge request gitlab-org/gitlab!59689

app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue

@@ -28,7 +28,7 @@ export default {
     <status-icon :show-disabled-button="true" status="warning" />
     <div class="media-body">
       <span class="gl-ml-3 gl-font-weight-bold gl-display-block gl-w-100">{{
-        s__('mrWidget|Before this can be merged, one or more threads must be resolved.')
+        s__('mrWidget|Merge blocked: all threads must be resolved.')
       }}</span>
       <gl-button
         data-testid="jump-to-first"

locale/gitlab.pot

@@ -38267,9 +38267,6 @@ msgstr ""
 msgid "mrWidget|Are you adding technical debt or code vulnerabilities?"
 msgstr ""
 
-msgid "mrWidget|Before this can be merged, one or more threads must be resolved."
-msgstr ""
-
 msgid "mrWidget|Cancel automatic merge"
 msgstr ""
 
@@ -38336,6 +38333,9 @@ msgstr ""
 msgid "mrWidget|Merge"
 msgstr ""
 
+msgid "mrWidget|Merge blocked: all threads must be resolved."
+msgstr ""
+
 msgid "mrWidget|Merge failed."
 msgstr ""
 

spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb

@@ -72,7 +72,7 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j
         end
 
         it 'shows a warning that the merge request contains unresolved threads' do
-          expect(page).to have_content 'Before this can be merged,'
+          expect(page).to have_content 'all threads must be resolved'
         end
 
         it 'has a link to resolve all threads by creating an issue' do

spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb

@@ -21,7 +21,7 @@ RSpec.describe 'Merge request > User sees merge button depending on unresolved t
     context 'with unresolved threads' do
       it 'does not allow to merge' do
         expect(page).not_to have_button 'Merge'
-        expect(page).to have_content('Before this can be merged,')
+        expect(page).to have_content('all threads must be resolved')
       end
     end
 

spec/frontend/vue_mr_widget/components/states/mr_widget_unresolved_discussions_spec.js

@@ -42,9 +42,7 @@ describe('UnresolvedDiscussions', () => {
     });
 
     it('should have correct elements', () => {
-      expect(wrapper.element.innerText).toContain(
-        `Before this can be merged, one or more threads must be resolved.`,
-      );
+      expect(wrapper.element.innerText).toContain(`Merge blocked: all threads must be resolved.`);
 
       expect(wrapper.element.innerText).toContain('Jump to first unresolved thread');
       expect(wrapper.element.innerText).toContain('Resolve all threads in new issue');
@@ -56,9 +54,7 @@ describe('UnresolvedDiscussions', () => {
 
   describe('without threads path', () => {
     it('should not show create issue link if user cannot create issue', () => {
-      expect(wrapper.element.innerText).toContain(
-        `Before this can be merged, one or more threads must be resolved.`,
-      );
+      expect(wrapper.element.innerText).toContain(`Merge blocked: all threads must be resolved.`);
 
       expect(wrapper.element.innerText).toContain('Jump to first unresolved thread');
       expect(wrapper.element.innerText).not.toContain('Resolve all threads in new issue');