Merge branch '289827-aqualls-resolve-thread' into 'master'

Revise messages about creating follow-up issue

See merge request gitlab-org/gitlab!70070

app/assets/javascripts/notes/components/discussion_counter.vue

@@ -78,8 +78,8 @@ export default {
         v-if="resolveAllDiscussionsIssuePath && !allResolved"
         v-gl-tooltip
         :href="resolveAllDiscussionsIssuePath"
-        :title="s__('Resolve all threads in new issue')"
-        :aria-label="s__('Resolve all threads in new issue')"
+        :title="s__('Create issue to resolve all threads')"
+        :aria-label="s__('Create issue to resolve all threads')"
         class="new-issue-for-discussion discussion-create-issue-btn"
         icon="issue-new"
       />

app/assets/javascripts/notes/components/discussion_resolve_with_issue_button.vue

@@ -4,7 +4,7 @@ import { s__ } from '~/locale';
 
 export default {
   i18n: {
-    buttonLabel: s__('MergeRequests|Resolve this thread in a new issue'),
+    buttonLabel: s__('MergeRequests|Create issue to resolve thread'),
   },
   name: 'ResolveWithIssueButton',
   components: {

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

@@ -46,7 +46,7 @@ export default {
         size="small"
         icon="issue-new"
       >
-        {{ s__('mrWidget|Resolve all threads in new issue') }}
+        {{ s__('mrWidget|Create issue to resolve all threads') }}
       </gl-button>
     </div>
   </div>

locale/gitlab.pot

@@ -9501,6 +9501,9 @@ msgstr ""
 msgid "Create issue"
 msgstr ""
 
+msgid "Create issue to resolve all threads"
+msgstr ""
+
 msgid "Create iteration"
 msgstr ""
 
@@ -21197,10 +21200,10 @@ msgstr ""
 msgid "MergeRequests|An error occurred while saving the draft comment."
 msgstr ""
 
-msgid "MergeRequests|Failed to squash. Should be done manually."
+msgid "MergeRequests|Create issue to resolve thread"
 msgstr ""
 
-msgid "MergeRequests|Resolve this thread in a new issue"
+msgid "MergeRequests|Failed to squash. Should be done manually."
 msgstr ""
 
 msgid "MergeRequests|Saving the comment failed"
@@ -28625,9 +28628,6 @@ msgstr ""
 msgid "Resolve"
 msgstr ""
 
-msgid "Resolve all threads in new issue"
-msgstr ""
-
 msgid "Resolve conflicts"
 msgstr ""
 
@@ -40105,6 +40105,9 @@ msgid_plural "mrWidget|Closes issues"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "mrWidget|Create issue to resolve all threads"
+msgstr ""
+
 msgid "mrWidget|Delete source branch"
 msgstr ""
 
@@ -40215,9 +40218,6 @@ msgstr ""
 msgid "mrWidget|Request to merge"
 msgstr ""
 
-msgid "mrWidget|Resolve all threads in new issue"
-msgstr ""
-
 msgid "mrWidget|Resolve conflicts"
 msgstr ""
 

spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j
 
     it 'shows a button to resolve all threads by creating a new issue' do
       within('.line-resolve-all-container') do
-        expect(page).to have_selector resolve_all_discussions_link_selector( title: "Resolve all threads in new issue" )
+        expect(page).to have_selector resolve_all_discussions_link_selector( title: "Create issue to resolve all threads" )
       end
     end
 
@@ -38,7 +38,7 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j
 
       it 'hides the link for creating a new issue' do
         expect(page).not_to have_selector resolve_all_discussions_link_selector
-        expect(page).not_to have_content "Resolve all threads in new issue"
+        expect(page).not_to have_content "Create issue to resolve all threads"
       end
     end
 
@@ -62,7 +62,7 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j
         end
 
         it 'does not show a link to create a new issue' do
-          expect(page).not_to have_link 'Resolve all threads in new issue'
+          expect(page).not_to have_link 'Create issue to resolve all threads'
         end
       end
 
@@ -77,14 +77,14 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j
 
         it 'has a link to resolve all threads by creating an issue' do
           page.within '.mr-widget-body' do
-            expect(page).to have_link 'Resolve all threads in new issue', href: new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid)
+            expect(page).to have_link 'Create issue to resolve all threads', href: new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid)
           end
         end
 
         context 'creating an issue for threads' do
           before do
             page.within '.mr-widget-body' do
-              page.click_link 'Resolve all threads in new issue', href: new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid)
+              page.click_link 'Create issue to resolve all threads', href: new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid)
 
               wait_for_all_requests
             end

spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe 'Resolve an open thread in a merge request by creating an issue',
   let!(:discussion) { create(:diff_note_on_merge_request, noteable: merge_request, project: project).to_discussion }
 
   def resolve_discussion_selector
-    title = 'Resolve this thread in a new issue'
+    title = 'Create issue to resolve thread'
     url = new_project_issue_path(project, discussion_to_resolve: discussion.id, merge_request_to_resolve_discussions_of: merge_request.iid)
     "a[title=\"#{title}\"][href=\"#{url}\"]"
   end

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

@@ -45,7 +45,7 @@ describe('UnresolvedDiscussions', () => {
       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');
+      expect(wrapper.element.innerText).toContain('Create issue to resolve all threads');
       expect(wrapper.element.querySelector('.js-create-issue').getAttribute('href')).toEqual(
         TEST_HOST,
       );
@@ -57,7 +57,7 @@ describe('UnresolvedDiscussions', () => {
       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');
+      expect(wrapper.element.innerText).not.toContain('Create issue to resolve all threads');
       expect(wrapper.element.querySelector('.js-create-issue')).toEqual(null);
     });
   });